diff --git a/Roadmap.md b/Roadmap.md deleted file mode 100644 index 37bf5b1a2..000000000 --- a/Roadmap.md +++ /dev/null @@ -1,50 +0,0 @@ -~~**Swimming in Jizz:**~~ - - - ~~This is where I make all the stuff before beta.~~ - - ~~It's been over nine months already, still a shorter dev time than my previous projects.~~ - -~~**Icarus pls play:**~~ - - - ~~Beta release.~~ - - ~~Finetuning the basics, rebalances, etc.~~ - - ~~See if I can add those damn swimming anims.~~ - - ~~Beg more artists for intermission fanart.~~ - - ~~Stuff to maybe add during this stage: Explodium Guns akimbo, Quick grenade.~~ - - ~~Collectibles. Froggy Chair was only the beginning.~~ - -**Cutie Robutt Adventures:** - - - Going Gold™. - - Think about the future. There are lots of things I could do now *(see FuturePlans.md)*. - -**Extra Funtimes:** - - - Extra Collectibles and Achievements. - - DLC weaponset. - - DLC minigame set. - -**LODS OF LORE:** - - - Finish writing all those damn side stories. - - Make 'em fancy, maybe add some lil' art to them. - -**Funny Fellas:** - - - Monster/decoration replacement packs. All of it modeled and tweaked to fit the style and theme of the mod. Expect enhanced enemy behavior, not gonna keep it "vanilla". - - Ibuki, Saya and Kirin companions. - - Porting weapons to Hideous Destructor as a meme: - - Explodium Gun - - Wallbuster - - Biospark Carbine - - Silver Bullet JET - -**A Vast New World (2.0):** - - - Hardcore mode (separate mod). - - DLC weaponset 2. - - DLC itemset. - - Official mapset. - -**At this point I'm just making shit up:** - - - Official comic. diff --git a/graphics/Achievements/AchievementBarrel.png b/graphics/Achievements/AchievementBarrel.png new file mode 100644 index 000000000..e2f9a3003 Binary files /dev/null and b/graphics/Achievements/AchievementBarrel.png differ diff --git a/graphics/Achievements/AchievementBaseball.png b/graphics/Achievements/AchievementBaseball.png new file mode 100644 index 000000000..3bd0a43d1 Binary files /dev/null and b/graphics/Achievements/AchievementBaseball.png differ diff --git a/graphics/Achievements/AchievementBlaze.png b/graphics/Achievements/AchievementBlaze.png new file mode 100644 index 000000000..6b43c77a2 Binary files /dev/null and b/graphics/Achievements/AchievementBlaze.png differ diff --git a/graphics/Achievements/AchievementCandy.png b/graphics/Achievements/AchievementCandy.png index f12a0c705..2f81bce56 100644 Binary files a/graphics/Achievements/AchievementCandy.png and b/graphics/Achievements/AchievementCandy.png differ diff --git a/graphics/Achievements/AchievementCheat.png b/graphics/Achievements/AchievementCheat.png new file mode 100644 index 000000000..eee41f503 Binary files /dev/null and b/graphics/Achievements/AchievementCheat.png differ diff --git a/graphics/Achievements/AchievementCrush.png b/graphics/Achievements/AchievementCrush.png new file mode 100644 index 000000000..f64d1c5a6 Binary files /dev/null and b/graphics/Achievements/AchievementCrush.png differ diff --git a/graphics/Achievements/AchievementCybully.png b/graphics/Achievements/AchievementCybully.png new file mode 100644 index 000000000..0bec60999 Binary files /dev/null and b/graphics/Achievements/AchievementCybully.png differ diff --git a/graphics/Achievements/AchievementDeadeye.png b/graphics/Achievements/AchievementDeadeye.png index aa49d55f2..d07dd40a0 100644 Binary files a/graphics/Achievements/AchievementDeadeye.png and b/graphics/Achievements/AchievementDeadeye.png differ diff --git a/graphics/Achievements/AchievementDeva.png b/graphics/Achievements/AchievementDeva.png new file mode 100644 index 000000000..26169ca09 Binary files /dev/null and b/graphics/Achievements/AchievementDeva.png differ diff --git a/graphics/Achievements/AchievementDivine.png b/graphics/Achievements/AchievementDivine.png new file mode 100644 index 000000000..f2f63f83d Binary files /dev/null and b/graphics/Achievements/AchievementDivine.png differ diff --git a/graphics/Achievements/AchievementDoodle.png b/graphics/Achievements/AchievementDoodle.png new file mode 100644 index 000000000..03d790b85 Binary files /dev/null and b/graphics/Achievements/AchievementDoodle.png differ diff --git a/graphics/Achievements/AchievementGrenade.png b/graphics/Achievements/AchievementGrenade.png index 0a6afd4f6..645a6efa1 100644 Binary files a/graphics/Achievements/AchievementGrenade.png and b/graphics/Achievements/AchievementGrenade.png differ diff --git a/graphics/Achievements/AchievementHurry.png b/graphics/Achievements/AchievementHurry.png new file mode 100644 index 000000000..9ce74b866 Binary files /dev/null and b/graphics/Achievements/AchievementHurry.png differ diff --git a/graphics/Achievements/AchievementKancho.png b/graphics/Achievements/AchievementKancho.png new file mode 100644 index 000000000..1cf6f158c Binary files /dev/null and b/graphics/Achievements/AchievementKancho.png differ diff --git a/graphics/Achievements/AchievementKeen.png b/graphics/Achievements/AchievementKeen.png new file mode 100644 index 000000000..3c6a8bddd Binary files /dev/null and b/graphics/Achievements/AchievementKeen.png differ diff --git a/graphics/Achievements/AchievementOneHP.png b/graphics/Achievements/AchievementOneHP.png new file mode 100644 index 000000000..8076506c2 Binary files /dev/null and b/graphics/Achievements/AchievementOneHP.png differ diff --git a/graphics/Achievements/AchievementPeace.png b/graphics/Achievements/AchievementPeace.png index 79b8986f2..cb46a37c8 100644 Binary files a/graphics/Achievements/AchievementPeace.png and b/graphics/Achievements/AchievementPeace.png differ diff --git a/graphics/Achievements/AchievementPuzzle.png b/graphics/Achievements/AchievementPuzzle.png new file mode 100644 index 000000000..6be08659a Binary files /dev/null and b/graphics/Achievements/AchievementPuzzle.png differ diff --git a/graphics/Achievements/AchievementSneaky.png b/graphics/Achievements/AchievementSneaky.png new file mode 100644 index 000000000..197f554bd Binary files /dev/null and b/graphics/Achievements/AchievementSneaky.png differ diff --git a/graphics/Achievements/AchievementTender.png b/graphics/Achievements/AchievementTender.png new file mode 100644 index 000000000..f2b171e99 Binary files /dev/null and b/graphics/Achievements/AchievementTender.png differ diff --git a/graphics/Achievements/AchievementTornado.png b/graphics/Achievements/AchievementTornado.png new file mode 100644 index 000000000..c744cff27 Binary files /dev/null and b/graphics/Achievements/AchievementTornado.png differ diff --git a/graphics/Achievements/AchievementTrash.png b/graphics/Achievements/AchievementTrash.png new file mode 100644 index 000000000..2a2f34535 Binary files /dev/null and b/graphics/Achievements/AchievementTrash.png differ diff --git a/graphics/Achievements/AchievementTravel.png b/graphics/Achievements/AchievementTravel.png new file mode 100644 index 000000000..d9ec8cdcf Binary files /dev/null and b/graphics/Achievements/AchievementTravel.png differ diff --git a/graphics/Achievements/AchievementUntouchable.png b/graphics/Achievements/AchievementUntouchable.png index d99ea3e6a..e21f7d639 100644 Binary files a/graphics/Achievements/AchievementUntouchable.png and b/graphics/Achievements/AchievementUntouchable.png differ diff --git a/graphics/Fanart/Marisa7.jpg b/graphics/Fanart/Marisa7.jpg new file mode 100644 index 000000000..2c8840876 Binary files /dev/null and b/graphics/Fanart/Marisa7.jpg differ diff --git a/language.def_base b/language.def_base index 6a6b31dc0..9ae599a1e 100644 --- a/language.def_base +++ b/language.def_base @@ -653,7 +653,7 @@ SWWM_TITLEMODBY = "a mod by \cxMarisa Kirisame"; SWWM_TITLESCROLL = "SWWM GZ ~ Cute Robutt Whomst Love To Explode Demons\n" "A wondrous GZDoom gameplay mod by Marisa Kirisame of UnSX Team\n" "Lovingly designed 3D models with hand-painted 256-color dithered textures\n" -"Over 50k lines of ZScript, and still counting (god help me)\n" +"Almost 60k lines of ZScript, and still counting (god help me)\n" "The deepest lore this side of the Doom Modiverse\n" "And much much more!\n" "Greetz to Mub, Ribbed, Slemg, Bunr, Kegbine, Term-kun, Hype64, Bartendy, Skelly, Mr. BIG SHOT WildWeasel, Endy, Mima-sama, Sinkie, BillowPlaster, Disgusting Dog Water, Dangle Logo, Lämp Paipu, Leek Spah, Boingy, MarTREE, Dusty Demon Bread, Roasted Rock, Ed the Netcode Boy, Thirst Cactus, JimJam, Cappy Jay, A Nom, Missy Fits, Minor Cookie, Squid Kid, YukiCute, MafSulk, FineRaff25, NetroRutcase, ShudTheFugUpRyan, Kobl, Cacous Seriodemon, Zomb, Man of Chins, Bun Pun, Zikeous Shadestructor, Blimyot, Baja Blast Tittums, DrySpy.py, Typo Gem, Wantopus, Morf, Daedalus, Popato, SpengRob, Sgt. Shellpost, Loud M, Snk, Donut, C.Kid, Emit Birb, You Go To Sleep, Rach, Le No Chicken, Murasa, Smart Cactus Dude, Phantomboobs, Sanae Kochiya, Gardeboy, Cat, HK417, Smol Koa, Joe Mama, Jahn, Guta, Glue, Atan, Schweet Prints, Angury Teeth Practitioner, Sell Her, MiSiFu, Portuguese Sausage, Scoob Stub, Actually Jabba, Very Honest Cat, Chiaki's Tit Mole, Homie, Snacks, Tubz, Toof, Teef, Frisp, Trashkat, Succ 'n Spicy, Melissa Follower When, Shokku, Scummyboi, Kat Gravity Rush, John Romero, John Carmack, Tim Allen, Tim Sweeney and last but not least my beloved pet dragon\n" @@ -914,7 +914,7 @@ SWWM_INTERTIP139 = "It's said that the Hand of Divine bears only a minuscule fra SWWM_INTERTIP140 = "The Demolitionist's chassis carries a faint lime scent."; // intermission fanart SWWM_FANART = "Art: "; -SWWM_NFANART = "12"; +SWWM_NFANART = "13"; SWWM_FANART1 = "S20TBL.jpg;Substance20 (@S20_TBL)"; SWWM_FANART2 = "CaptainJ.png;Captain J (@Jho7835)"; SWWM_FANART3 = "RedeadITA.png;Redead-ITA"; @@ -927,6 +927,7 @@ SWWM_FANART9 = "Marisa3.jpg"; SWWM_FANART10 = "Marisa4.jpg"; SWWM_FANART11 = "Marisa5.jpg"; SWWM_FANART12 = "Marisa6.jpg"; +SWWM_FANART13 = "Marisa7.jpg"; // achievements SWWM_ACHIEVEMENT_ACID_TAG = "Fizzy Goodness"; SWWM_ACHIEVEMENT_ACID_TXT = "Melt %d enemies with Telebrium Flechettes"; diff --git a/language.def_menu b/language.def_menu index 1c747ff7a..a131e44cf 100644 --- a/language.def_menu +++ b/language.def_menu @@ -318,7 +318,7 @@ TOOLTIP_SWWM_DAMAGETARGET = "Select when targetter healthbars should be shown."; TOOLTIP_SWWM_STRICTUNTOUCHABLE = "By default, the \"Untouchable\" bonus is active until you take direct damage. If you feel this isn't strict enough, you can also make it end if armor absorbs the damage, or, for extra strictness, on ANY hit, even while invulnerable."; TOOLTIP_SWWM_SILENCEMAP = "Chooses whether you want music to stop when you 100% a map."; TOOLTIP_SWWM_SHADOWDIST = "Maximum distance at which to show blob shadows. May help performance."; -TOOLTIP_SWWM_SWAPWEAPONS = "Allow only one weapon per slot (excluding Deep Impact). Disable if you'd rather ignore this puny attempt at balance."; +TOOLTIP_SWWM_SWAPWEAPONS = "Allow only one weapon per slot (excluding Deep Impact). Disable if you'd rather throw balance out the window."; TOOLTIP_SWWM_FORCESTATS = "Shows map statistics in the HUD even when the automap isn't open."; TOOLTIP_SWWM_FUNTRAILS = "Recolors the trails left by slot 5 weapon projectiles."; TOOLTIP_SWWM_PISTOLSTART = "Forces you to pistol start between levels/clusters. This excludes travel between levels within a hub, however."; diff --git a/language.es_base b/language.es_base index c7fe1a897..e32fa1ad6 100644 --- a/language.es_base +++ b/language.es_base @@ -547,7 +547,7 @@ SWWM_TITLEMODBY = "un mod de \cxMarisa Kirisame"; SWWM_TITLESCROLL = "SWWM GZ ~ Cute Robutt Whomst Love To Explode Demons\n" "Un maravilleante mod de gameplay para GZDoom por Marisa Kirisame de UnSX Team\n" "Modelos 3D diseñados con cariño con texturas pintadas a mano de 256 colores con dithering\n" -"Mas de 50 mil líneas de ZScript, y aun contando (dios me ayude)\n" +"Casi 60 mil líneas de ZScript, y aun contando (dios me ayude)\n" "El lore más profundo a este lado del Modiverso de Doom\n" "¡Y mucho mucho más!\nSaludos a Mub, Ribbed, Slemg, Bunr, Kegbine, Term-kun, Hype64, Bartendy, Skelly, Mr. BIG SHOT WildWeasel, Endy, Mima-sama, Sinkie, BillowPlaster, Disgusting Dog Water, Dangle Logo, Lämp Paipu, Leek Spah, Boingy, MarTREE, Dusty Demon Bread, Roasted Rock, Ed the Netcode Boy, Thirst Cactus, JimJam, Cappy Jay, A Nom, Missy Fits, Minor Cookie, Squid Kid, YukiCute, MafSulk, FineRaff25, NetroRutcase, ShudTheFugUpRyan, Kobl, Cacous Seriodemon, Zomb, Man of Chins, Bun Pun, Zikeous Shadestructor, Blimyot, Baja Blast Tittums, DrySpy.py, Typo Gem, Wantopus, Morf, Daedalus, Popato, SpengRob, Sgt. Shellpost, Loud M, Snk, Donut, C.Kid, Emit Birb, You Go To Sleep, Rach, Le No Chicken, Murasa, Smart Cactus Dude, Phantomboobs, Sanae Kochiya, Gardeboy, Cat, HK417, Smol Koa, Joe Mama, Jahn, Guta, Glue, Atan, Schweet Prints, Angury Teeth Practitioner, Sell Her, MiSiFu, Portuguese Sausage, Scoob Stub, Actually Jabba, Very Honest Cat, Chiaki's Tit Mole, Homie, Snacks, Tubz, Toof, Teef, Frisp, Trashkat, Succ 'n Spicy, Melissa Follower When, Shokku, Scummyboi, Kat Gravity Rush, John Romero, John Carmack, Tim Allen, Tim Sweeney y por último pero no menos importante mi querido dragón mascota\n" "He intentado estrujar todos los nombres que he podido ahí, que haya podido recordar, por lo menos, así que si no estás ahí y quieres entrar, solo pídelo\n" diff --git a/language.es_menu b/language.es_menu index 0df0d93d8..b857f996b 100644 --- a/language.es_menu +++ b/language.es_menu @@ -317,7 +317,7 @@ TOOLTIP_SWWM_DAMAGETARGET = "Selecciona cuando deben mostrarse las barras de vid TOOLTIP_SWWM_STRICTUNTOUCHABLE = "Por defecto, el bonus \"Intocable\" permanece activo hasta que recibas daño directo. Si sientes que esto no es suficientemente estricto, también puedes hacer que termine si la armadura absorbe el daño, o, para mayor severidad, con CUALQUIER golpe, incluso siendo invulnerable."; TOOLTIP_SWWM_SILENCEMAP = "Elige si quieres que la música se detenga cuando completas un mapa al 100%."; TOOLTIP_SWWM_SHADOWDIST = "Distancia máxima a la que mostrar sombras. Puede ayudar al rendimiento."; -TOOLTIP_SWWM_SWAPWEAPONS = "Permite solo un arma por puesto (excluyendo Deep Impact). Desactiva si prefieres ignorar este intento inútil de balance."; +TOOLTIP_SWWM_SWAPWEAPONS = "Permite solo un arma por puesto (excluyendo Deep Impact). Desactiva si prefieres tirar el balance por la ventana."; TOOLTIP_SWWM_FORCESTATS = "Muestra estadísticas de mapa en el HUD incluso cuando el automapa no está abierto."; TOOLTIP_SWWM_FUNTRAILS = "Recolorea los rastros dejados por proyectiles de armas de ranura 5."; TOOLTIP_SWWM_PISTOLSTART = "Fuerza hacer pistol start entre niveles/clústers. Aunque esto excluye viajes entre niveles de un mismo hub."; diff --git a/language.version b/language.version index 161ab3809..085466359 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r14 \cu(Wed 8 Sep 22:13:51 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1pre r14 \cu(2021-09-08 22:13:51)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r15 \cu(Sat 11 Sep 21:15:52 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1pre r15 \cu(2021-09-11 21:15:52)\c-"; diff --git a/models/extra/dlc/BlastMuz0.png b/models/extra/dlc1/BlastMuz0.png similarity index 100% rename from models/extra/dlc/BlastMuz0.png rename to models/extra/dlc1/BlastMuz0.png diff --git a/models/extra/dlc/BlastMuz1.png b/models/extra/dlc1/BlastMuz1.png similarity index 100% rename from models/extra/dlc/BlastMuz1.png rename to models/extra/dlc1/BlastMuz1.png diff --git a/models/extra/dlc/BlastMuz2.png b/models/extra/dlc1/BlastMuz2.png similarity index 100% rename from models/extra/dlc/BlastMuz2.png rename to models/extra/dlc1/BlastMuz2.png diff --git a/models/extra/dlc/BlastMuz3.png b/models/extra/dlc1/BlastMuz3.png similarity index 100% rename from models/extra/dlc/BlastMuz3.png rename to models/extra/dlc1/BlastMuz3.png diff --git a/models/extra/dlc/BlastMuz4.png b/models/extra/dlc1/BlastMuz4.png similarity index 100% rename from models/extra/dlc/BlastMuz4.png rename to models/extra/dlc1/BlastMuz4.png diff --git a/models/extra/dlc/BlastMuz5.png b/models/extra/dlc1/BlastMuz5.png similarity index 100% rename from models/extra/dlc/BlastMuz5.png rename to models/extra/dlc1/BlastMuz5.png diff --git a/models/extra/dlc/BlastMuz6.png b/models/extra/dlc1/BlastMuz6.png similarity index 100% rename from models/extra/dlc/BlastMuz6.png rename to models/extra/dlc1/BlastMuz6.png diff --git a/models/extra/dlc/BlastMuz7.png b/models/extra/dlc1/BlastMuz7.png similarity index 100% rename from models/extra/dlc/BlastMuz7.png rename to models/extra/dlc1/BlastMuz7.png diff --git a/models/extra/dlc/BlastMuz8.png b/models/extra/dlc1/BlastMuz8.png similarity index 100% rename from models/extra/dlc/BlastMuz8.png rename to models/extra/dlc1/BlastMuz8.png diff --git a/models/extra/dlc/BlastMuz9.png b/models/extra/dlc1/BlastMuz9.png similarity index 100% rename from models/extra/dlc/BlastMuz9.png rename to models/extra/dlc1/BlastMuz9.png diff --git a/models/extra/dlc/LanceTracer.png b/models/extra/dlc1/LanceTracer.png similarity index 100% rename from models/extra/dlc/LanceTracer.png rename to models/extra/dlc1/LanceTracer.png diff --git a/models/extra/dlc/PlasmaTracer.png b/models/extra/dlc1/PlasmaTracer.png similarity index 100% rename from models/extra/dlc/PlasmaTracer.png rename to models/extra/dlc1/PlasmaTracer.png diff --git a/models/extra/dlc/PlasmaTrail.png b/models/extra/dlc1/PlasmaTrail.png similarity index 100% rename from models/extra/dlc/PlasmaTrail.png rename to models/extra/dlc1/PlasmaTrail.png diff --git a/models/extra/dlc/PuntzerMuz0.png b/models/extra/dlc1/PuntzerMuz0.png similarity index 100% rename from models/extra/dlc/PuntzerMuz0.png rename to models/extra/dlc1/PuntzerMuz0.png diff --git a/models/extra/dlc/PuntzerMuz1.png b/models/extra/dlc1/PuntzerMuz1.png similarity index 100% rename from models/extra/dlc/PuntzerMuz1.png rename to models/extra/dlc1/PuntzerMuz1.png diff --git a/models/extra/dlc/PuntzerMuz2.png b/models/extra/dlc1/PuntzerMuz2.png similarity index 100% rename from models/extra/dlc/PuntzerMuz2.png rename to models/extra/dlc1/PuntzerMuz2.png diff --git a/models/extra/dlc/PuntzerMuz3.png b/models/extra/dlc1/PuntzerMuz3.png similarity index 100% rename from models/extra/dlc/PuntzerMuz3.png rename to models/extra/dlc1/PuntzerMuz3.png diff --git a/models/extra/dlc/PuntzerMuz4.png b/models/extra/dlc1/PuntzerMuz4.png similarity index 100% rename from models/extra/dlc/PuntzerMuz4.png rename to models/extra/dlc1/PuntzerMuz4.png diff --git a/models/extra/dlc/PuntzerMuz5.png b/models/extra/dlc1/PuntzerMuz5.png similarity index 100% rename from models/extra/dlc/PuntzerMuz5.png rename to models/extra/dlc1/PuntzerMuz5.png diff --git a/models/extra/dlc/PuntzerMuz6.png b/models/extra/dlc1/PuntzerMuz6.png similarity index 100% rename from models/extra/dlc/PuntzerMuz6.png rename to models/extra/dlc1/PuntzerMuz6.png diff --git a/models/extra/dlc/PuntzerMuz7.png b/models/extra/dlc1/PuntzerMuz7.png similarity index 100% rename from models/extra/dlc/PuntzerMuz7.png rename to models/extra/dlc1/PuntzerMuz7.png diff --git a/models/extra/dlc/QuadMuz0.png b/models/extra/dlc1/QuadMuz0.png similarity index 100% rename from models/extra/dlc/QuadMuz0.png rename to models/extra/dlc1/QuadMuz0.png diff --git a/models/extra/dlc/QuadMuz1.png b/models/extra/dlc1/QuadMuz1.png similarity index 100% rename from models/extra/dlc/QuadMuz1.png rename to models/extra/dlc1/QuadMuz1.png diff --git a/models/extra/dlc/QuadMuz2.png b/models/extra/dlc1/QuadMuz2.png similarity index 100% rename from models/extra/dlc/QuadMuz2.png rename to models/extra/dlc1/QuadMuz2.png diff --git a/models/extra/dlc/QuadMuz3.png b/models/extra/dlc1/QuadMuz3.png similarity index 100% rename from models/extra/dlc/QuadMuz3.png rename to models/extra/dlc1/QuadMuz3.png diff --git a/models/extra/dlc/QuadMuz4.png b/models/extra/dlc1/QuadMuz4.png similarity index 100% rename from models/extra/dlc/QuadMuz4.png rename to models/extra/dlc1/QuadMuz4.png diff --git a/models/extra/dlc/QuadMuz5.png b/models/extra/dlc1/QuadMuz5.png similarity index 100% rename from models/extra/dlc/QuadMuz5.png rename to models/extra/dlc1/QuadMuz5.png diff --git a/models/extra/dlc/QuadMuz6.png b/models/extra/dlc1/QuadMuz6.png similarity index 100% rename from models/extra/dlc/QuadMuz6.png rename to models/extra/dlc1/QuadMuz6.png diff --git a/models/extra/dlc/QuadMuz7.png b/models/extra/dlc1/QuadMuz7.png similarity index 100% rename from models/extra/dlc/QuadMuz7.png rename to models/extra/dlc1/QuadMuz7.png diff --git a/models/extra/dlc/QuadMuz8.png b/models/extra/dlc1/QuadMuz8.png similarity index 100% rename from models/extra/dlc/QuadMuz8.png rename to models/extra/dlc1/QuadMuz8.png diff --git a/models/extra/dlc/QuadMuz9.png b/models/extra/dlc1/QuadMuz9.png similarity index 100% rename from models/extra/dlc/QuadMuz9.png rename to models/extra/dlc1/QuadMuz9.png diff --git a/models/extra/dlc/RailMuz0.png b/models/extra/dlc1/RailMuz0.png similarity index 100% rename from models/extra/dlc/RailMuz0.png rename to models/extra/dlc1/RailMuz0.png diff --git a/models/extra/dlc/RailMuz1.png b/models/extra/dlc1/RailMuz1.png similarity index 100% rename from models/extra/dlc/RailMuz1.png rename to models/extra/dlc1/RailMuz1.png diff --git a/models/extra/dlc/RailMuz2.png b/models/extra/dlc1/RailMuz2.png similarity index 100% rename from models/extra/dlc/RailMuz2.png rename to models/extra/dlc1/RailMuz2.png diff --git a/models/extra/dlc/RailMuz3.png b/models/extra/dlc1/RailMuz3.png similarity index 100% rename from models/extra/dlc/RailMuz3.png rename to models/extra/dlc1/RailMuz3.png diff --git a/models/extra/dlc/RayTracer.png b/models/extra/dlc1/RayTracer.png similarity index 100% rename from models/extra/dlc/RayTracer.png rename to models/extra/dlc1/RayTracer.png diff --git a/models/extra/dlc/RayTrail.png b/models/extra/dlc1/RayTrail.png similarity index 100% rename from models/extra/dlc/RayTrail.png rename to models/extra/dlc1/RayTrail.png diff --git a/models/extra/dlc/SheenMuz0.png b/models/extra/dlc1/SheenMuz0.png similarity index 100% rename from models/extra/dlc/SheenMuz0.png rename to models/extra/dlc1/SheenMuz0.png diff --git a/models/extra/dlc/SheenMuz1.png b/models/extra/dlc1/SheenMuz1.png similarity index 100% rename from models/extra/dlc/SheenMuz1.png rename to models/extra/dlc1/SheenMuz1.png diff --git a/models/extra/dlc/SheenMuz2.png b/models/extra/dlc1/SheenMuz2.png similarity index 100% rename from models/extra/dlc/SheenMuz2.png rename to models/extra/dlc1/SheenMuz2.png diff --git a/models/extra/dlc/SheenMuz3.png b/models/extra/dlc1/SheenMuz3.png similarity index 100% rename from models/extra/dlc/SheenMuz3.png rename to models/extra/dlc1/SheenMuz3.png diff --git a/models/extra/dlc/SheenMuz4.png b/models/extra/dlc1/SheenMuz4.png similarity index 100% rename from models/extra/dlc/SheenMuz4.png rename to models/extra/dlc1/SheenMuz4.png diff --git a/models/extra/dlc/SheenMuz5.png b/models/extra/dlc1/SheenMuz5.png similarity index 100% rename from models/extra/dlc/SheenMuz5.png rename to models/extra/dlc1/SheenMuz5.png diff --git a/models/extra/dlc/SheenMuz6.png b/models/extra/dlc1/SheenMuz6.png similarity index 100% rename from models/extra/dlc/SheenMuz6.png rename to models/extra/dlc1/SheenMuz6.png diff --git a/models/extra/dlc/SheenMuz7.png b/models/extra/dlc1/SheenMuz7.png similarity index 100% rename from models/extra/dlc/SheenMuz7.png rename to models/extra/dlc1/SheenMuz7.png diff --git a/models/extra/dlc/SheenTracer.png b/models/extra/dlc1/SheenTracer.png similarity index 100% rename from models/extra/dlc/SheenTracer.png rename to models/extra/dlc1/SheenTracer.png diff --git a/models/extra/dlc/SheenTracer_Blue.png b/models/extra/dlc1/SheenTracer_Blue.png similarity index 100% rename from models/extra/dlc/SheenTracer_Blue.png rename to models/extra/dlc1/SheenTracer_Blue.png diff --git a/models/extra/dlc/SheenTracer_Cyan.png b/models/extra/dlc1/SheenTracer_Cyan.png similarity index 100% rename from models/extra/dlc/SheenTracer_Cyan.png rename to models/extra/dlc1/SheenTracer_Cyan.png diff --git a/models/extra/dlc/SheenTracer_Green.png b/models/extra/dlc1/SheenTracer_Green.png similarity index 100% rename from models/extra/dlc/SheenTracer_Green.png rename to models/extra/dlc1/SheenTracer_Green.png diff --git a/models/extra/dlc/SheenTracer_Magenta.png b/models/extra/dlc1/SheenTracer_Magenta.png similarity index 100% rename from models/extra/dlc/SheenTracer_Magenta.png rename to models/extra/dlc1/SheenTracer_Magenta.png diff --git a/models/extra/dlc/SheenTracer_Red.png b/models/extra/dlc1/SheenTracer_Red.png similarity index 100% rename from models/extra/dlc/SheenTracer_Red.png rename to models/extra/dlc1/SheenTracer_Red.png diff --git a/models/extra/dlc/SheenTracer_TransBlue.png b/models/extra/dlc1/SheenTracer_TransBlue.png similarity index 100% rename from models/extra/dlc/SheenTracer_TransBlue.png rename to models/extra/dlc1/SheenTracer_TransBlue.png diff --git a/models/extra/dlc/SheenTracer_TransPink.png b/models/extra/dlc1/SheenTracer_TransPink.png similarity index 100% rename from models/extra/dlc/SheenTracer_TransPink.png rename to models/extra/dlc1/SheenTracer_TransPink.png diff --git a/models/extra/dlc/SheenTracer_White.png b/models/extra/dlc1/SheenTracer_White.png similarity index 100% rename from models/extra/dlc/SheenTracer_White.png rename to models/extra/dlc1/SheenTracer_White.png diff --git a/models/extra/dlc/SheenTracer_Yellow.png b/models/extra/dlc1/SheenTracer_Yellow.png similarity index 100% rename from models/extra/dlc/SheenTracer_Yellow.png rename to models/extra/dlc1/SheenTracer_Yellow.png diff --git a/models/extra/dlc/MRBolt.png b/models/extra/dlc2/MRBolt.png similarity index 100% rename from models/extra/dlc/MRBolt.png rename to models/extra/dlc2/MRBolt.png diff --git a/models/extra/dlc/MRBoltS.png b/models/extra/dlc2/MRBoltS.png similarity index 100% rename from models/extra/dlc/MRBoltS.png rename to models/extra/dlc2/MRBoltS.png diff --git a/models/extra/dlc/MRMuz0.png b/models/extra/dlc2/MRMuz0.png similarity index 100% rename from models/extra/dlc/MRMuz0.png rename to models/extra/dlc2/MRMuz0.png diff --git a/models/extra/dlc/MRMuz1.png b/models/extra/dlc2/MRMuz1.png similarity index 100% rename from models/extra/dlc/MRMuz1.png rename to models/extra/dlc2/MRMuz1.png diff --git a/models/extra/dlc/MRMuz2.png b/models/extra/dlc2/MRMuz2.png similarity index 100% rename from models/extra/dlc/MRMuz2.png rename to models/extra/dlc2/MRMuz2.png diff --git a/models/extra/dlc/MRMuz3.png b/models/extra/dlc2/MRMuz3.png similarity index 100% rename from models/extra/dlc/MRMuz3.png rename to models/extra/dlc2/MRMuz3.png diff --git a/models/extra/dlc/NewSparkMuzK.png b/models/extra/dlc2/NewSparkMuzK.png similarity index 100% rename from models/extra/dlc/NewSparkMuzK.png rename to models/extra/dlc2/NewSparkMuzK.png diff --git a/models/extra/dlc/NewSparkMuzN.png b/models/extra/dlc2/NewSparkMuzN.png similarity index 100% rename from models/extra/dlc/NewSparkMuzN.png rename to models/extra/dlc2/NewSparkMuzN.png diff --git a/models/extra/dlc/NewSparkMuzNK.png b/models/extra/dlc2/NewSparkMuzNK.png similarity index 100% rename from models/extra/dlc/NewSparkMuzNK.png rename to models/extra/dlc2/NewSparkMuzNK.png diff --git a/models/extra/dlc/UltimaMuz0.png b/models/extra/dlc2/UltimaMuz0.png similarity index 100% rename from models/extra/dlc/UltimaMuz0.png rename to models/extra/dlc2/UltimaMuz0.png diff --git a/models/extra/dlc/UltimaMuz1.png b/models/extra/dlc2/UltimaMuz1.png similarity index 100% rename from models/extra/dlc/UltimaMuz1.png rename to models/extra/dlc2/UltimaMuz1.png diff --git a/models/extra/dlc/UltimaMuz2.png b/models/extra/dlc2/UltimaMuz2.png similarity index 100% rename from models/extra/dlc/UltimaMuz2.png rename to models/extra/dlc2/UltimaMuz2.png diff --git a/models/extra/dlc/UltimaMuz3.png b/models/extra/dlc2/UltimaMuz3.png similarity index 100% rename from models/extra/dlc/UltimaMuz3.png rename to models/extra/dlc2/UltimaMuz3.png diff --git a/models/extra/dlc/UltimaTrail.png b/models/extra/dlc2/UltimaTrail.png similarity index 100% rename from models/extra/dlc/UltimaTrail.png rename to models/extra/dlc2/UltimaTrail.png diff --git a/readme.txt b/readme.txt index 2d5b06829..41181da79 100644 --- a/readme.txt +++ b/readme.txt @@ -35,6 +35,9 @@ Index of contents: 2.2.9. Lämp 2.2.A. Omnisight 2.2.B. Mykradvo Artifact + 2.2.C. Devastation Sigil + 2.2.D. Divine Sprite + 2.2.E. Safety Tether 2.3. Armors 2.4. Health 2.5. Others @@ -272,6 +275,20 @@ in the minimap, and even highlights where keys and exits are. Quite handy. The Great Anomaly makes a return. Smite all those who dare try to attack you! +2.2.C. Devastation Sigil + +A return of the olden "Complete Devastation" powerup of the early versions, +with a shiny new look, and some real attitude. + +2.2.D. Divine Sprite + +The Soul Spark from Platinum also makes a return, now with far more power. + +2.2.E. Safety Tether + +Sometimes you really just need to warp away from some nasty spot. This exists +for that very reason. + 2.3. Armors - - - - - - diff --git a/sprites/dlc/BFRGA0.png b/sprites/dlc1/BFRGA0.png similarity index 100% rename from sprites/dlc/BFRGA0.png rename to sprites/dlc1/BFRGA0.png diff --git a/sprites/dlc/BFRGB0.png b/sprites/dlc1/BFRGB0.png similarity index 100% rename from sprites/dlc/BFRGB0.png rename to sprites/dlc1/BFRGB0.png diff --git a/sprites/dlc/BFRGC0.png b/sprites/dlc1/BFRGC0.png similarity index 100% rename from sprites/dlc/BFRGC0.png rename to sprites/dlc1/BFRGC0.png diff --git a/sprites/dlc/BFRGD0.png b/sprites/dlc1/BFRGD0.png similarity index 100% rename from sprites/dlc/BFRGD0.png rename to sprites/dlc1/BFRGD0.png diff --git a/sprites/dlc/BFRGE0.png b/sprites/dlc1/BFRGE0.png similarity index 100% rename from sprites/dlc/BFRGE0.png rename to sprites/dlc1/BFRGE0.png diff --git a/sprites/dlc/BFRGF0.png b/sprites/dlc1/BFRGF0.png similarity index 100% rename from sprites/dlc/BFRGF0.png rename to sprites/dlc1/BFRGF0.png diff --git a/sprites/dlc/BFRGG0.png b/sprites/dlc1/BFRGG0.png similarity index 100% rename from sprites/dlc/BFRGG0.png rename to sprites/dlc1/BFRGG0.png diff --git a/sprites/dlc/BFRGH0.png b/sprites/dlc1/BFRGH0.png similarity index 100% rename from sprites/dlc/BFRGH0.png rename to sprites/dlc1/BFRGH0.png diff --git a/sprites/dlc/BFRGI0.png b/sprites/dlc1/BFRGI0.png similarity index 100% rename from sprites/dlc/BFRGI0.png rename to sprites/dlc1/BFRGI0.png diff --git a/sprites/dlc/BFRGJ0.png b/sprites/dlc1/BFRGJ0.png similarity index 100% rename from sprites/dlc/BFRGJ0.png rename to sprites/dlc1/BFRGJ0.png diff --git a/sprites/dlc/BFRGK0.png b/sprites/dlc1/BFRGK0.png similarity index 100% rename from sprites/dlc/BFRGK0.png rename to sprites/dlc1/BFRGK0.png diff --git a/sprites/dlc/BFRGL0.png b/sprites/dlc1/BFRGL0.png similarity index 100% rename from sprites/dlc/BFRGL0.png rename to sprites/dlc1/BFRGL0.png diff --git a/sprites/dlc/BFRGM0.png b/sprites/dlc1/BFRGM0.png similarity index 100% rename from sprites/dlc/BFRGM0.png rename to sprites/dlc1/BFRGM0.png diff --git a/sprites/dlc/BFRGN0.png b/sprites/dlc1/BFRGN0.png similarity index 100% rename from sprites/dlc/BFRGN0.png rename to sprites/dlc1/BFRGN0.png diff --git a/sprites/dlc/BFRGO0.png b/sprites/dlc1/BFRGO0.png similarity index 100% rename from sprites/dlc/BFRGO0.png rename to sprites/dlc1/BFRGO0.png diff --git a/sprites/dlc/BFRGP0.png b/sprites/dlc1/BFRGP0.png similarity index 100% rename from sprites/dlc/BFRGP0.png rename to sprites/dlc1/BFRGP0.png diff --git a/sprites/dlc/BFRGQ0.png b/sprites/dlc1/BFRGQ0.png similarity index 100% rename from sprites/dlc/BFRGQ0.png rename to sprites/dlc1/BFRGQ0.png diff --git a/sprites/dlc/BFRGR0.png b/sprites/dlc1/BFRGR0.png similarity index 100% rename from sprites/dlc/BFRGR0.png rename to sprites/dlc1/BFRGR0.png diff --git a/sprites/dlc/BFRGS0.png b/sprites/dlc1/BFRGS0.png similarity index 100% rename from sprites/dlc/BFRGS0.png rename to sprites/dlc1/BFRGS0.png diff --git a/sprites/dlc/BFRGT0.png b/sprites/dlc1/BFRGT0.png similarity index 100% rename from sprites/dlc/BFRGT0.png rename to sprites/dlc1/BFRGT0.png diff --git a/sprites/dlc/BFSMA0.png b/sprites/dlc1/BFSMA0.png similarity index 100% rename from sprites/dlc/BFSMA0.png rename to sprites/dlc1/BFSMA0.png diff --git a/sprites/dlc/BFSMB0.png b/sprites/dlc1/BFSMB0.png similarity index 100% rename from sprites/dlc/BFSMB0.png rename to sprites/dlc1/BFSMB0.png diff --git a/sprites/dlc/BFSMC0.png b/sprites/dlc1/BFSMC0.png similarity index 100% rename from sprites/dlc/BFSMC0.png rename to sprites/dlc1/BFSMC0.png diff --git a/sprites/dlc/BFSMD0.png b/sprites/dlc1/BFSMD0.png similarity index 100% rename from sprites/dlc/BFSMD0.png rename to sprites/dlc1/BFSMD0.png diff --git a/sprites/dlc/BFSME0.png b/sprites/dlc1/BFSME0.png similarity index 100% rename from sprites/dlc/BFSME0.png rename to sprites/dlc1/BFSME0.png diff --git a/sprites/dlc/BFSMF0.png b/sprites/dlc1/BFSMF0.png similarity index 100% rename from sprites/dlc/BFSMF0.png rename to sprites/dlc1/BFSMF0.png diff --git a/sprites/dlc/BFSMG0.png b/sprites/dlc1/BFSMG0.png similarity index 100% rename from sprites/dlc/BFSMG0.png rename to sprites/dlc1/BFSMG0.png diff --git a/sprites/dlc/BFSMH0.png b/sprites/dlc1/BFSMH0.png similarity index 100% rename from sprites/dlc/BFSMH0.png rename to sprites/dlc1/BFSMH0.png diff --git a/sprites/dlc/BFSMI0.png b/sprites/dlc1/BFSMI0.png similarity index 100% rename from sprites/dlc/BFSMI0.png rename to sprites/dlc1/BFSMI0.png diff --git a/sprites/dlc/BFSMJ0.png b/sprites/dlc1/BFSMJ0.png similarity index 100% rename from sprites/dlc/BFSMJ0.png rename to sprites/dlc1/BFSMJ0.png diff --git a/sprites/dlc/BFSMK0.png b/sprites/dlc1/BFSMK0.png similarity index 100% rename from sprites/dlc/BFSMK0.png rename to sprites/dlc1/BFSMK0.png diff --git a/sprites/dlc/BFSML0.png b/sprites/dlc1/BFSML0.png similarity index 100% rename from sprites/dlc/BFSML0.png rename to sprites/dlc1/BFSML0.png diff --git a/sprites/dlc/BFSMM0.png b/sprites/dlc1/BFSMM0.png similarity index 100% rename from sprites/dlc/BFSMM0.png rename to sprites/dlc1/BFSMM0.png diff --git a/sprites/dlc/BFSMN0.png b/sprites/dlc1/BFSMN0.png similarity index 100% rename from sprites/dlc/BFSMN0.png rename to sprites/dlc1/BFSMN0.png diff --git a/sprites/dlc/BFSMO0.png b/sprites/dlc1/BFSMO0.png similarity index 100% rename from sprites/dlc/BFSMO0.png rename to sprites/dlc1/BFSMO0.png diff --git a/sprites/dlc/BFSMP0.png b/sprites/dlc1/BFSMP0.png similarity index 100% rename from sprites/dlc/BFSMP0.png rename to sprites/dlc1/BFSMP0.png diff --git a/sprites/dlc/BFSMQ0.png b/sprites/dlc1/BFSMQ0.png similarity index 100% rename from sprites/dlc/BFSMQ0.png rename to sprites/dlc1/BFSMQ0.png diff --git a/sprites/dlc/BFSMR0.png b/sprites/dlc1/BFSMR0.png similarity index 100% rename from sprites/dlc/BFSMR0.png rename to sprites/dlc1/BFSMR0.png diff --git a/sprites/dlc/BFSMS0.png b/sprites/dlc1/BFSMS0.png similarity index 100% rename from sprites/dlc/BFSMS0.png rename to sprites/dlc1/BFSMS0.png diff --git a/sprites/dlc/BFSMT0.png b/sprites/dlc1/BFSMT0.png similarity index 100% rename from sprites/dlc/BFSMT0.png rename to sprites/dlc1/BFSMT0.png diff --git a/sprites/dlc/BFSMU0.png b/sprites/dlc1/BFSMU0.png similarity index 100% rename from sprites/dlc/BFSMU0.png rename to sprites/dlc1/BFSMU0.png diff --git a/sprites/dlc/BFSMV0.png b/sprites/dlc1/BFSMV0.png similarity index 100% rename from sprites/dlc/BFSMV0.png rename to sprites/dlc1/BFSMV0.png diff --git a/sprites/dlc/BFSMW0.png b/sprites/dlc1/BFSMW0.png similarity index 100% rename from sprites/dlc/BFSMW0.png rename to sprites/dlc1/BFSMW0.png diff --git a/sprites/dlc/BFSMX0.png b/sprites/dlc1/BFSMX0.png similarity index 100% rename from sprites/dlc/BFSMX0.png rename to sprites/dlc1/BFSMX0.png diff --git a/sprites/dlc/BFSMY0.png b/sprites/dlc1/BFSMY0.png similarity index 100% rename from sprites/dlc/BFSMY0.png rename to sprites/dlc1/BFSMY0.png diff --git a/sprites/dlc/BFSMZ0.png b/sprites/dlc1/BFSMZ0.png similarity index 100% rename from sprites/dlc/BFSMZ0.png rename to sprites/dlc1/BFSMZ0.png diff --git a/sprites/dlc/BFXXA0.png b/sprites/dlc1/BFXXA0.png similarity index 100% rename from sprites/dlc/BFXXA0.png rename to sprites/dlc1/BFXXA0.png diff --git a/sprites/dlc/BFXXB0.png b/sprites/dlc1/BFXXB0.png similarity index 100% rename from sprites/dlc/BFXXB0.png rename to sprites/dlc1/BFXXB0.png diff --git a/sprites/dlc/BFXXC0.png b/sprites/dlc1/BFXXC0.png similarity index 100% rename from sprites/dlc/BFXXC0.png rename to sprites/dlc1/BFXXC0.png diff --git a/sprites/dlc/BFXXD0.png b/sprites/dlc1/BFXXD0.png similarity index 100% rename from sprites/dlc/BFXXD0.png rename to sprites/dlc1/BFXXD0.png diff --git a/sprites/dlc/BFXXE0.png b/sprites/dlc1/BFXXE0.png similarity index 100% rename from sprites/dlc/BFXXE0.png rename to sprites/dlc1/BFXXE0.png diff --git a/sprites/dlc/BFXXF0.png b/sprites/dlc1/BFXXF0.png similarity index 100% rename from sprites/dlc/BFXXF0.png rename to sprites/dlc1/BFXXF0.png diff --git a/sprites/dlc/BFXXG0.png b/sprites/dlc1/BFXXG0.png similarity index 100% rename from sprites/dlc/BFXXG0.png rename to sprites/dlc1/BFXXG0.png diff --git a/sprites/dlc/BFXXH0.png b/sprites/dlc1/BFXXH0.png similarity index 100% rename from sprites/dlc/BFXXH0.png rename to sprites/dlc1/BFXXH0.png diff --git a/sprites/dlc/BFXXI0.png b/sprites/dlc1/BFXXI0.png similarity index 100% rename from sprites/dlc/BFXXI0.png rename to sprites/dlc1/BFXXI0.png diff --git a/sprites/dlc/BFXXJ0.png b/sprites/dlc1/BFXXJ0.png similarity index 100% rename from sprites/dlc/BFXXJ0.png rename to sprites/dlc1/BFXXJ0.png diff --git a/sprites/dlc/BFXXK0.png b/sprites/dlc1/BFXXK0.png similarity index 100% rename from sprites/dlc/BFXXK0.png rename to sprites/dlc1/BFXXK0.png diff --git a/sprites/dlc/BFXXL0.png b/sprites/dlc1/BFXXL0.png similarity index 100% rename from sprites/dlc/BFXXL0.png rename to sprites/dlc1/BFXXL0.png diff --git a/sprites/dlc/BFXXM0.png b/sprites/dlc1/BFXXM0.png similarity index 100% rename from sprites/dlc/BFXXM0.png rename to sprites/dlc1/BFXXM0.png diff --git a/sprites/dlc/BFXXN0.png b/sprites/dlc1/BFXXN0.png similarity index 100% rename from sprites/dlc/BFXXN0.png rename to sprites/dlc1/BFXXN0.png diff --git a/sprites/dlc/BFXXO0.png b/sprites/dlc1/BFXXO0.png similarity index 100% rename from sprites/dlc/BFXXO0.png rename to sprites/dlc1/BFXXO0.png diff --git a/sprites/dlc/BFXXP0.png b/sprites/dlc1/BFXXP0.png similarity index 100% rename from sprites/dlc/BFXXP0.png rename to sprites/dlc1/BFXXP0.png diff --git a/sprites/dlc/BFXXQ0.png b/sprites/dlc1/BFXXQ0.png similarity index 100% rename from sprites/dlc/BFXXQ0.png rename to sprites/dlc1/BFXXQ0.png diff --git a/sprites/dlc/BFXXR0.png b/sprites/dlc1/BFXXR0.png similarity index 100% rename from sprites/dlc/BFXXR0.png rename to sprites/dlc1/BFXXR0.png diff --git a/sprites/dlc/BFXXS0.png b/sprites/dlc1/BFXXS0.png similarity index 100% rename from sprites/dlc/BFXXS0.png rename to sprites/dlc1/BFXXS0.png diff --git a/sprites/dlc/BFXXT0.png b/sprites/dlc1/BFXXT0.png similarity index 100% rename from sprites/dlc/BFXXT0.png rename to sprites/dlc1/BFXXT0.png diff --git a/sprites/dlc/BXPLA0.png b/sprites/dlc1/BXPLA0.png similarity index 100% rename from sprites/dlc/BXPLA0.png rename to sprites/dlc1/BXPLA0.png diff --git a/sprites/dlc/BXPLB0.png b/sprites/dlc1/BXPLB0.png similarity index 100% rename from sprites/dlc/BXPLB0.png rename to sprites/dlc1/BXPLB0.png diff --git a/sprites/dlc/BXPLC0.png b/sprites/dlc1/BXPLC0.png similarity index 100% rename from sprites/dlc/BXPLC0.png rename to sprites/dlc1/BXPLC0.png diff --git a/sprites/dlc/BXPLD0.png b/sprites/dlc1/BXPLD0.png similarity index 100% rename from sprites/dlc/BXPLD0.png rename to sprites/dlc1/BXPLD0.png diff --git a/sprites/dlc/BXPLE0.png b/sprites/dlc1/BXPLE0.png similarity index 100% rename from sprites/dlc/BXPLE0.png rename to sprites/dlc1/BXPLE0.png diff --git a/sprites/dlc/BXPLF0.png b/sprites/dlc1/BXPLF0.png similarity index 100% rename from sprites/dlc/BXPLF0.png rename to sprites/dlc1/BXPLF0.png diff --git a/sprites/dlc/BXPLG0.png b/sprites/dlc1/BXPLG0.png similarity index 100% rename from sprites/dlc/BXPLG0.png rename to sprites/dlc1/BXPLG0.png diff --git a/sprites/dlc/BXPLH0.png b/sprites/dlc1/BXPLH0.png similarity index 100% rename from sprites/dlc/BXPLH0.png rename to sprites/dlc1/BXPLH0.png diff --git a/sprites/dlc/BXPLI0.png b/sprites/dlc1/BXPLI0.png similarity index 100% rename from sprites/dlc/BXPLI0.png rename to sprites/dlc1/BXPLI0.png diff --git a/sprites/dlc/BXPLJ0.png b/sprites/dlc1/BXPLJ0.png similarity index 100% rename from sprites/dlc/BXPLJ0.png rename to sprites/dlc1/BXPLJ0.png diff --git a/sprites/dlc/BXPLK0.png b/sprites/dlc1/BXPLK0.png similarity index 100% rename from sprites/dlc/BXPLK0.png rename to sprites/dlc1/BXPLK0.png diff --git a/sprites/dlc/BXPLL0.png b/sprites/dlc1/BXPLL0.png similarity index 100% rename from sprites/dlc/BXPLL0.png rename to sprites/dlc1/BXPLL0.png diff --git a/sprites/dlc/BXPLM0.png b/sprites/dlc1/BXPLM0.png similarity index 100% rename from sprites/dlc/BXPLM0.png rename to sprites/dlc1/BXPLM0.png diff --git a/sprites/dlc/BXPLN0.png b/sprites/dlc1/BXPLN0.png similarity index 100% rename from sprites/dlc/BXPLN0.png rename to sprites/dlc1/BXPLN0.png diff --git a/sprites/dlc/BXPLO0.png b/sprites/dlc1/BXPLO0.png similarity index 100% rename from sprites/dlc/BXPLO0.png rename to sprites/dlc1/BXPLO0.png diff --git a/sprites/dlc/BXPLP0.png b/sprites/dlc1/BXPLP0.png similarity index 100% rename from sprites/dlc/BXPLP0.png rename to sprites/dlc1/BXPLP0.png diff --git a/sprites/dlc/BXPLQ0.png b/sprites/dlc1/BXPLQ0.png similarity index 100% rename from sprites/dlc/BXPLQ0.png rename to sprites/dlc1/BXPLQ0.png diff --git a/sprites/dlc/BXPLR0.png b/sprites/dlc1/BXPLR0.png similarity index 100% rename from sprites/dlc/BXPLR0.png rename to sprites/dlc1/BXPLR0.png diff --git a/sprites/dlc/BXPLS0.png b/sprites/dlc1/BXPLS0.png similarity index 100% rename from sprites/dlc/BXPLS0.png rename to sprites/dlc1/BXPLS0.png diff --git a/sprites/dlc/BXPLT0.png b/sprites/dlc1/BXPLT0.png similarity index 100% rename from sprites/dlc/BXPLT0.png rename to sprites/dlc1/BXPLT0.png diff --git a/sprites/dlc/BXPLU0.png b/sprites/dlc1/BXPLU0.png similarity index 100% rename from sprites/dlc/BXPLU0.png rename to sprites/dlc1/BXPLU0.png diff --git a/sprites/dlc/BXPLV0.png b/sprites/dlc1/BXPLV0.png similarity index 100% rename from sprites/dlc/BXPLV0.png rename to sprites/dlc1/BXPLV0.png diff --git a/sprites/dlc/BXPLW0.png b/sprites/dlc1/BXPLW0.png similarity index 100% rename from sprites/dlc/BXPLW0.png rename to sprites/dlc1/BXPLW0.png diff --git a/sprites/dlc/BXPLX0.png b/sprites/dlc1/BXPLX0.png similarity index 100% rename from sprites/dlc/BXPLX0.png rename to sprites/dlc1/BXPLX0.png diff --git a/sprites/dlc/BXPLY0.png b/sprites/dlc1/BXPLY0.png similarity index 100% rename from sprites/dlc/BXPLY0.png rename to sprites/dlc1/BXPLY0.png diff --git a/sprites/dlc/BXPLZ0.png b/sprites/dlc1/BXPLZ0.png similarity index 100% rename from sprites/dlc/BXPLZ0.png rename to sprites/dlc1/BXPLZ0.png diff --git a/sprites/dlc/BXPL[0.png b/sprites/dlc1/BXPL[0.png similarity index 100% rename from sprites/dlc/BXPL[0.png rename to sprites/dlc1/BXPL[0.png diff --git a/sprites/dlc/BXPL^0.png b/sprites/dlc1/BXPL^0.png similarity index 100% rename from sprites/dlc/BXPL^0.png rename to sprites/dlc1/BXPL^0.png diff --git a/sprites/dlc/PBBLA0.png b/sprites/dlc1/PBBLA0.png similarity index 100% rename from sprites/dlc/PBBLA0.png rename to sprites/dlc1/PBBLA0.png diff --git a/sprites/dlc/PBBLB0.png b/sprites/dlc1/PBBLB0.png similarity index 100% rename from sprites/dlc/PBBLB0.png rename to sprites/dlc1/PBBLB0.png diff --git a/sprites/dlc/PBBLC0.png b/sprites/dlc1/PBBLC0.png similarity index 100% rename from sprites/dlc/PBBLC0.png rename to sprites/dlc1/PBBLC0.png diff --git a/sprites/dlc/PBBLD0.png b/sprites/dlc1/PBBLD0.png similarity index 100% rename from sprites/dlc/PBBLD0.png rename to sprites/dlc1/PBBLD0.png diff --git a/sprites/dlc/PBBLE0.png b/sprites/dlc1/PBBLE0.png similarity index 100% rename from sprites/dlc/PBBLE0.png rename to sprites/dlc1/PBBLE0.png diff --git a/sprites/dlc/PBBLF0.png b/sprites/dlc1/PBBLF0.png similarity index 100% rename from sprites/dlc/PBBLF0.png rename to sprites/dlc1/PBBLF0.png diff --git a/sprites/dlc/PBBLG0.png b/sprites/dlc1/PBBLG0.png similarity index 100% rename from sprites/dlc/PBBLG0.png rename to sprites/dlc1/PBBLG0.png diff --git a/sprites/dlc/PBBLH0.png b/sprites/dlc1/PBBLH0.png similarity index 100% rename from sprites/dlc/PBBLH0.png rename to sprites/dlc1/PBBLH0.png diff --git a/sprites/dlc/PBBLI0.png b/sprites/dlc1/PBBLI0.png similarity index 100% rename from sprites/dlc/PBBLI0.png rename to sprites/dlc1/PBBLI0.png diff --git a/sprites/dlc/PBBLJ0.png b/sprites/dlc1/PBBLJ0.png similarity index 100% rename from sprites/dlc/PBBLJ0.png rename to sprites/dlc1/PBBLJ0.png diff --git a/sprites/dlc/PBMBA0.png b/sprites/dlc1/PBMBA0.png similarity index 100% rename from sprites/dlc/PBMBA0.png rename to sprites/dlc1/PBMBA0.png diff --git a/sprites/dlc/PBMBB0.png b/sprites/dlc1/PBMBB0.png similarity index 100% rename from sprites/dlc/PBMBB0.png rename to sprites/dlc1/PBMBB0.png diff --git a/sprites/dlc/PBMBC0.png b/sprites/dlc1/PBMBC0.png similarity index 100% rename from sprites/dlc/PBMBC0.png rename to sprites/dlc1/PBMBC0.png diff --git a/sprites/dlc/PBMBD0.png b/sprites/dlc1/PBMBD0.png similarity index 100% rename from sprites/dlc/PBMBD0.png rename to sprites/dlc1/PBMBD0.png diff --git a/sprites/dlc/PBMBE0.png b/sprites/dlc1/PBMBE0.png similarity index 100% rename from sprites/dlc/PBMBE0.png rename to sprites/dlc1/PBMBE0.png diff --git a/sprites/dlc/PBMBF0.png b/sprites/dlc1/PBMBF0.png similarity index 100% rename from sprites/dlc/PBMBF0.png rename to sprites/dlc1/PBMBF0.png diff --git a/sprites/dlc/PBMBG0.png b/sprites/dlc1/PBMBG0.png similarity index 100% rename from sprites/dlc/PBMBG0.png rename to sprites/dlc1/PBMBG0.png diff --git a/sprites/dlc/PBMBH0.png b/sprites/dlc1/PBMBH0.png similarity index 100% rename from sprites/dlc/PBMBH0.png rename to sprites/dlc1/PBMBH0.png diff --git a/sprites/dlc/PBMBI0.png b/sprites/dlc1/PBMBI0.png similarity index 100% rename from sprites/dlc/PBMBI0.png rename to sprites/dlc1/PBMBI0.png diff --git a/sprites/dlc/PBMBJ0.png b/sprites/dlc1/PBMBJ0.png similarity index 100% rename from sprites/dlc/PBMBJ0.png rename to sprites/dlc1/PBMBJ0.png diff --git a/sprites/dlc/PBMBK0.png b/sprites/dlc1/PBMBK0.png similarity index 100% rename from sprites/dlc/PBMBK0.png rename to sprites/dlc1/PBMBK0.png diff --git a/sprites/dlc/PBMBL0.png b/sprites/dlc1/PBMBL0.png similarity index 100% rename from sprites/dlc/PBMBL0.png rename to sprites/dlc1/PBMBL0.png diff --git a/sprites/dlc/QEMBA0.png b/sprites/dlc1/QEMBA0.png similarity index 100% rename from sprites/dlc/QEMBA0.png rename to sprites/dlc1/QEMBA0.png diff --git a/sprites/dlc/QEMBB0.png b/sprites/dlc1/QEMBB0.png similarity index 100% rename from sprites/dlc/QEMBB0.png rename to sprites/dlc1/QEMBB0.png diff --git a/sprites/dlc/QEMBC0.png b/sprites/dlc1/QEMBC0.png similarity index 100% rename from sprites/dlc/QEMBC0.png rename to sprites/dlc1/QEMBC0.png diff --git a/sprites/dlc/QEMBD0.png b/sprites/dlc1/QEMBD0.png similarity index 100% rename from sprites/dlc/QEMBD0.png rename to sprites/dlc1/QEMBD0.png diff --git a/sprites/dlc/QEMBE0.png b/sprites/dlc1/QEMBE0.png similarity index 100% rename from sprites/dlc/QEMBE0.png rename to sprites/dlc1/QEMBE0.png diff --git a/sprites/dlc/QFBLA0.png b/sprites/dlc1/QFBLA0.png similarity index 100% rename from sprites/dlc/QFBLA0.png rename to sprites/dlc1/QFBLA0.png diff --git a/sprites/dlc/QFBLB0.png b/sprites/dlc1/QFBLB0.png similarity index 100% rename from sprites/dlc/QFBLB0.png rename to sprites/dlc1/QFBLB0.png diff --git a/sprites/dlc/QFBLC0.png b/sprites/dlc1/QFBLC0.png similarity index 100% rename from sprites/dlc/QFBLC0.png rename to sprites/dlc1/QFBLC0.png diff --git a/sprites/dlc/QFBLD0.png b/sprites/dlc1/QFBLD0.png similarity index 100% rename from sprites/dlc/QFBLD0.png rename to sprites/dlc1/QFBLD0.png diff --git a/sprites/dlc/QFBLE0.png b/sprites/dlc1/QFBLE0.png similarity index 100% rename from sprites/dlc/QFBLE0.png rename to sprites/dlc1/QFBLE0.png diff --git a/sprites/dlc/QFBLF0.png b/sprites/dlc1/QFBLF0.png similarity index 100% rename from sprites/dlc/QFBLF0.png rename to sprites/dlc1/QFBLF0.png diff --git a/sprites/dlc/QFBLG0.png b/sprites/dlc1/QFBLG0.png similarity index 100% rename from sprites/dlc/QFBLG0.png rename to sprites/dlc1/QFBLG0.png diff --git a/sprites/dlc/QFBLH0.png b/sprites/dlc1/QFBLH0.png similarity index 100% rename from sprites/dlc/QFBLH0.png rename to sprites/dlc1/QFBLH0.png diff --git a/sprites/dlc/QFBLI0.png b/sprites/dlc1/QFBLI0.png similarity index 100% rename from sprites/dlc/QFBLI0.png rename to sprites/dlc1/QFBLI0.png diff --git a/sprites/dlc/QFBLJ0.png b/sprites/dlc1/QFBLJ0.png similarity index 100% rename from sprites/dlc/QFBLJ0.png rename to sprites/dlc1/QFBLJ0.png diff --git a/sprites/dlc/QFLRA0.png b/sprites/dlc1/QFLRA0.png similarity index 100% rename from sprites/dlc/QFLRA0.png rename to sprites/dlc1/QFLRA0.png diff --git a/sprites/dlc/RAYTA0.png b/sprites/dlc1/RAYTA0.png similarity index 100% rename from sprites/dlc/RAYTA0.png rename to sprites/dlc1/RAYTA0.png diff --git a/sprites/dlc/RAYTB0.png b/sprites/dlc1/RAYTB0.png similarity index 100% rename from sprites/dlc/RAYTB0.png rename to sprites/dlc1/RAYTB0.png diff --git a/sprites/dlc/RAYTC0.png b/sprites/dlc1/RAYTC0.png similarity index 100% rename from sprites/dlc/RAYTC0.png rename to sprites/dlc1/RAYTC0.png diff --git a/sprites/dlc/RAYTD0.png b/sprites/dlc1/RAYTD0.png similarity index 100% rename from sprites/dlc/RAYTD0.png rename to sprites/dlc1/RAYTD0.png diff --git a/sprites/dlc/RAYTE0.png b/sprites/dlc1/RAYTE0.png similarity index 100% rename from sprites/dlc/RAYTE0.png rename to sprites/dlc1/RAYTE0.png diff --git a/sprites/dlc/RAYTF0.png b/sprites/dlc1/RAYTF0.png similarity index 100% rename from sprites/dlc/RAYTF0.png rename to sprites/dlc1/RAYTF0.png diff --git a/sprites/dlc/RAYTG0.png b/sprites/dlc1/RAYTG0.png similarity index 100% rename from sprites/dlc/RAYTG0.png rename to sprites/dlc1/RAYTG0.png diff --git a/sprites/dlc/RAYTH0.png b/sprites/dlc1/RAYTH0.png similarity index 100% rename from sprites/dlc/RAYTH0.png rename to sprites/dlc1/RAYTH0.png diff --git a/sprites/dlc/RAYTI0.png b/sprites/dlc1/RAYTI0.png similarity index 100% rename from sprites/dlc/RAYTI0.png rename to sprites/dlc1/RAYTI0.png diff --git a/sprites/dlc/RAYTJ0.png b/sprites/dlc1/RAYTJ0.png similarity index 100% rename from sprites/dlc/RAYTJ0.png rename to sprites/dlc1/RAYTJ0.png diff --git a/sprites/dlc/RAYTK0.png b/sprites/dlc1/RAYTK0.png similarity index 100% rename from sprites/dlc/RAYTK0.png rename to sprites/dlc1/RAYTK0.png diff --git a/sprites/dlc/XEX5A0.png b/sprites/dlc1/XEX5A0.png similarity index 100% rename from sprites/dlc/XEX5A0.png rename to sprites/dlc1/XEX5A0.png diff --git a/sprites/dlc/XEX5B0.png b/sprites/dlc1/XEX5B0.png similarity index 100% rename from sprites/dlc/XEX5B0.png rename to sprites/dlc1/XEX5B0.png diff --git a/sprites/dlc/XEX5C0.png b/sprites/dlc1/XEX5C0.png similarity index 100% rename from sprites/dlc/XEX5C0.png rename to sprites/dlc1/XEX5C0.png diff --git a/sprites/dlc/XEX5D0.png b/sprites/dlc1/XEX5D0.png similarity index 100% rename from sprites/dlc/XEX5D0.png rename to sprites/dlc1/XEX5D0.png diff --git a/sprites/dlc/XEX5E0.png b/sprites/dlc1/XEX5E0.png similarity index 100% rename from sprites/dlc/XEX5E0.png rename to sprites/dlc1/XEX5E0.png diff --git a/sprites/dlc/XEX5F0.png b/sprites/dlc1/XEX5F0.png similarity index 100% rename from sprites/dlc/XEX5F0.png rename to sprites/dlc1/XEX5F0.png diff --git a/sprites/dlc/XEX5G0.png b/sprites/dlc1/XEX5G0.png similarity index 100% rename from sprites/dlc/XEX5G0.png rename to sprites/dlc1/XEX5G0.png diff --git a/sprites/dlc/XEX5H0.png b/sprites/dlc1/XEX5H0.png similarity index 100% rename from sprites/dlc/XEX5H0.png rename to sprites/dlc1/XEX5H0.png diff --git a/sprites/dlc/XEX5I0.png b/sprites/dlc1/XEX5I0.png similarity index 100% rename from sprites/dlc/XEX5I0.png rename to sprites/dlc1/XEX5I0.png diff --git a/sprites/dlc/XEX5J0.png b/sprites/dlc1/XEX5J0.png similarity index 100% rename from sprites/dlc/XEX5J0.png rename to sprites/dlc1/XEX5J0.png diff --git a/sprites/dlc/XEX5K0.png b/sprites/dlc1/XEX5K0.png similarity index 100% rename from sprites/dlc/XEX5K0.png rename to sprites/dlc1/XEX5K0.png diff --git a/sprites/dlc/XEX5L0.png b/sprites/dlc1/XEX5L0.png similarity index 100% rename from sprites/dlc/XEX5L0.png rename to sprites/dlc1/XEX5L0.png diff --git a/sprites/dlc/XEX5M0.png b/sprites/dlc1/XEX5M0.png similarity index 100% rename from sprites/dlc/XEX5M0.png rename to sprites/dlc1/XEX5M0.png diff --git a/sprites/dlc/XEX5N0.png b/sprites/dlc1/XEX5N0.png similarity index 100% rename from sprites/dlc/XEX5N0.png rename to sprites/dlc1/XEX5N0.png diff --git a/sprites/dlc/XEX5O0.png b/sprites/dlc1/XEX5O0.png similarity index 100% rename from sprites/dlc/XEX5O0.png rename to sprites/dlc1/XEX5O0.png diff --git a/sprites/dlc/XEX5P0.png b/sprites/dlc1/XEX5P0.png similarity index 100% rename from sprites/dlc/XEX5P0.png rename to sprites/dlc1/XEX5P0.png diff --git a/sprites/dlc/XEX5Q0.png b/sprites/dlc1/XEX5Q0.png similarity index 100% rename from sprites/dlc/XEX5Q0.png rename to sprites/dlc1/XEX5Q0.png diff --git a/sprites/dlc/XEX5R0.png b/sprites/dlc1/XEX5R0.png similarity index 100% rename from sprites/dlc/XEX5R0.png rename to sprites/dlc1/XEX5R0.png diff --git a/sprites/dlc/XEX5S0.png b/sprites/dlc1/XEX5S0.png similarity index 100% rename from sprites/dlc/XEX5S0.png rename to sprites/dlc1/XEX5S0.png diff --git a/sprites/dlc/XEX6A0.png b/sprites/dlc1/XEX6A0.png similarity index 100% rename from sprites/dlc/XEX6A0.png rename to sprites/dlc1/XEX6A0.png diff --git a/sprites/dlc/XEX6B0.png b/sprites/dlc1/XEX6B0.png similarity index 100% rename from sprites/dlc/XEX6B0.png rename to sprites/dlc1/XEX6B0.png diff --git a/sprites/dlc/XEX6C0.png b/sprites/dlc1/XEX6C0.png similarity index 100% rename from sprites/dlc/XEX6C0.png rename to sprites/dlc1/XEX6C0.png diff --git a/sprites/dlc/XEX6D0.png b/sprites/dlc1/XEX6D0.png similarity index 100% rename from sprites/dlc/XEX6D0.png rename to sprites/dlc1/XEX6D0.png diff --git a/sprites/dlc/XEX6E0.png b/sprites/dlc1/XEX6E0.png similarity index 100% rename from sprites/dlc/XEX6E0.png rename to sprites/dlc1/XEX6E0.png diff --git a/sprites/dlc/XEX6F0.png b/sprites/dlc1/XEX6F0.png similarity index 100% rename from sprites/dlc/XEX6F0.png rename to sprites/dlc1/XEX6F0.png diff --git a/sprites/dlc/XEX6G0.png b/sprites/dlc1/XEX6G0.png similarity index 100% rename from sprites/dlc/XEX6G0.png rename to sprites/dlc1/XEX6G0.png diff --git a/sprites/dlc/XEX6H0.png b/sprites/dlc1/XEX6H0.png similarity index 100% rename from sprites/dlc/XEX6H0.png rename to sprites/dlc1/XEX6H0.png diff --git a/sprites/dlc/XEX6I0.png b/sprites/dlc1/XEX6I0.png similarity index 100% rename from sprites/dlc/XEX6I0.png rename to sprites/dlc1/XEX6I0.png diff --git a/sprites/dlc/XEX6J0.png b/sprites/dlc1/XEX6J0.png similarity index 100% rename from sprites/dlc/XEX6J0.png rename to sprites/dlc1/XEX6J0.png diff --git a/sprites/dlc/XEX6K0.png b/sprites/dlc1/XEX6K0.png similarity index 100% rename from sprites/dlc/XEX6K0.png rename to sprites/dlc1/XEX6K0.png diff --git a/sprites/dlc/XEX6L0.png b/sprites/dlc1/XEX6L0.png similarity index 100% rename from sprites/dlc/XEX6L0.png rename to sprites/dlc1/XEX6L0.png diff --git a/sprites/dlc/XEX6M0.png b/sprites/dlc1/XEX6M0.png similarity index 100% rename from sprites/dlc/XEX6M0.png rename to sprites/dlc1/XEX6M0.png diff --git a/sprites/dlc/XEX6N0.png b/sprites/dlc1/XEX6N0.png similarity index 100% rename from sprites/dlc/XEX6N0.png rename to sprites/dlc1/XEX6N0.png diff --git a/sprites/dlc/XEX6O0.png b/sprites/dlc1/XEX6O0.png similarity index 100% rename from sprites/dlc/XEX6O0.png rename to sprites/dlc1/XEX6O0.png diff --git a/sprites/dlc/XEX6P0.png b/sprites/dlc1/XEX6P0.png similarity index 100% rename from sprites/dlc/XEX6P0.png rename to sprites/dlc1/XEX6P0.png diff --git a/sprites/dlc/XEX6Q0.png b/sprites/dlc1/XEX6Q0.png similarity index 100% rename from sprites/dlc/XEX6Q0.png rename to sprites/dlc1/XEX6Q0.png diff --git a/sprites/dlc/XEX6R0.png b/sprites/dlc1/XEX6R0.png similarity index 100% rename from sprites/dlc/XEX6R0.png rename to sprites/dlc1/XEX6R0.png diff --git a/sprites/dlc/XEX6S0.png b/sprites/dlc1/XEX6S0.png similarity index 100% rename from sprites/dlc/XEX6S0.png rename to sprites/dlc1/XEX6S0.png diff --git a/sprites/dlc/XRG6A0.png b/sprites/dlc1/XRG6A0.png similarity index 100% rename from sprites/dlc/XRG6A0.png rename to sprites/dlc1/XRG6A0.png diff --git a/sprites/dlc/XRG6B0.png b/sprites/dlc1/XRG6B0.png similarity index 100% rename from sprites/dlc/XRG6B0.png rename to sprites/dlc1/XRG6B0.png diff --git a/sprites/dlc/XRG6C0.png b/sprites/dlc1/XRG6C0.png similarity index 100% rename from sprites/dlc/XRG6C0.png rename to sprites/dlc1/XRG6C0.png diff --git a/sprites/dlc/XRG6D0.png b/sprites/dlc1/XRG6D0.png similarity index 100% rename from sprites/dlc/XRG6D0.png rename to sprites/dlc1/XRG6D0.png diff --git a/sprites/dlc/XRG6E0.png b/sprites/dlc1/XRG6E0.png similarity index 100% rename from sprites/dlc/XRG6E0.png rename to sprites/dlc1/XRG6E0.png diff --git a/sprites/dlc/XRG6F0.png b/sprites/dlc1/XRG6F0.png similarity index 100% rename from sprites/dlc/XRG6F0.png rename to sprites/dlc1/XRG6F0.png diff --git a/sprites/dlc/XRG6G0.png b/sprites/dlc1/XRG6G0.png similarity index 100% rename from sprites/dlc/XRG6G0.png rename to sprites/dlc1/XRG6G0.png diff --git a/sprites/dlc/XRG6H0.png b/sprites/dlc1/XRG6H0.png similarity index 100% rename from sprites/dlc/XRG6H0.png rename to sprites/dlc1/XRG6H0.png diff --git a/sprites/dlc/XRG6I0.png b/sprites/dlc1/XRG6I0.png similarity index 100% rename from sprites/dlc/XRG6I0.png rename to sprites/dlc1/XRG6I0.png diff --git a/sprites/dlc/XRG6J0.png b/sprites/dlc1/XRG6J0.png similarity index 100% rename from sprites/dlc/XRG6J0.png rename to sprites/dlc1/XRG6J0.png diff --git a/sprites/dlc/XRG6K0.png b/sprites/dlc1/XRG6K0.png similarity index 100% rename from sprites/dlc/XRG6K0.png rename to sprites/dlc1/XRG6K0.png diff --git a/sprites/dlc/XRG6L0.png b/sprites/dlc1/XRG6L0.png similarity index 100% rename from sprites/dlc/XRG6L0.png rename to sprites/dlc1/XRG6L0.png diff --git a/sprites/dlc/XRG6M0.png b/sprites/dlc1/XRG6M0.png similarity index 100% rename from sprites/dlc/XRG6M0.png rename to sprites/dlc1/XRG6M0.png diff --git a/sprites/dlc/XRG6N0.png b/sprites/dlc1/XRG6N0.png similarity index 100% rename from sprites/dlc/XRG6N0.png rename to sprites/dlc1/XRG6N0.png diff --git a/sprites/dlc/XRG6O0.png b/sprites/dlc1/XRG6O0.png similarity index 100% rename from sprites/dlc/XRG6O0.png rename to sprites/dlc1/XRG6O0.png diff --git a/sprites/dlc/XRG6P0.png b/sprites/dlc1/XRG6P0.png similarity index 100% rename from sprites/dlc/XRG6P0.png rename to sprites/dlc1/XRG6P0.png diff --git a/sprites/dlc/XRG6Q0.png b/sprites/dlc1/XRG6Q0.png similarity index 100% rename from sprites/dlc/XRG6Q0.png rename to sprites/dlc1/XRG6Q0.png diff --git a/sprites/dlc/XRG6R0.png b/sprites/dlc1/XRG6R0.png similarity index 100% rename from sprites/dlc/XRG6R0.png rename to sprites/dlc1/XRG6R0.png diff --git a/sprites/dlc/XRG6S0.png b/sprites/dlc1/XRG6S0.png similarity index 100% rename from sprites/dlc/XRG6S0.png rename to sprites/dlc1/XRG6S0.png diff --git a/sprites/dlc/XRG6T0.png b/sprites/dlc1/XRG6T0.png similarity index 100% rename from sprites/dlc/XRG6T0.png rename to sprites/dlc1/XRG6T0.png diff --git a/sprites/dlc/XRG6U0.png b/sprites/dlc1/XRG6U0.png similarity index 100% rename from sprites/dlc/XRG6U0.png rename to sprites/dlc1/XRG6U0.png diff --git a/sprites/dlc/XRG6V0.png b/sprites/dlc1/XRG6V0.png similarity index 100% rename from sprites/dlc/XRG6V0.png rename to sprites/dlc1/XRG6V0.png diff --git a/sprites/dlc/XRG6W0.png b/sprites/dlc1/XRG6W0.png similarity index 100% rename from sprites/dlc/XRG6W0.png rename to sprites/dlc1/XRG6W0.png diff --git a/sprites/dlc/XRG6X0.png b/sprites/dlc1/XRG6X0.png similarity index 100% rename from sprites/dlc/XRG6X0.png rename to sprites/dlc1/XRG6X0.png diff --git a/sprites/dlc/XRG7A0.png b/sprites/dlc1/XRG7A0.png similarity index 100% rename from sprites/dlc/XRG7A0.png rename to sprites/dlc1/XRG7A0.png diff --git a/sprites/dlc/XRG7B0.png b/sprites/dlc1/XRG7B0.png similarity index 100% rename from sprites/dlc/XRG7B0.png rename to sprites/dlc1/XRG7B0.png diff --git a/sprites/dlc/XRG7C0.png b/sprites/dlc1/XRG7C0.png similarity index 100% rename from sprites/dlc/XRG7C0.png rename to sprites/dlc1/XRG7C0.png diff --git a/sprites/dlc/XRG7D0.png b/sprites/dlc1/XRG7D0.png similarity index 100% rename from sprites/dlc/XRG7D0.png rename to sprites/dlc1/XRG7D0.png diff --git a/sprites/dlc/XRG7E0.png b/sprites/dlc1/XRG7E0.png similarity index 100% rename from sprites/dlc/XRG7E0.png rename to sprites/dlc1/XRG7E0.png diff --git a/sprites/dlc/XRG7F0.png b/sprites/dlc1/XRG7F0.png similarity index 100% rename from sprites/dlc/XRG7F0.png rename to sprites/dlc1/XRG7F0.png diff --git a/sprites/dlc/XRG7G0.png b/sprites/dlc1/XRG7G0.png similarity index 100% rename from sprites/dlc/XRG7G0.png rename to sprites/dlc1/XRG7G0.png diff --git a/sprites/dlc/XRG7H0.png b/sprites/dlc1/XRG7H0.png similarity index 100% rename from sprites/dlc/XRG7H0.png rename to sprites/dlc1/XRG7H0.png diff --git a/sprites/dlc/XRG7I0.png b/sprites/dlc1/XRG7I0.png similarity index 100% rename from sprites/dlc/XRG7I0.png rename to sprites/dlc1/XRG7I0.png diff --git a/sprites/dlc/XRG7J0.png b/sprites/dlc1/XRG7J0.png similarity index 100% rename from sprites/dlc/XRG7J0.png rename to sprites/dlc1/XRG7J0.png diff --git a/sprites/dlc/XRG7K0.png b/sprites/dlc1/XRG7K0.png similarity index 100% rename from sprites/dlc/XRG7K0.png rename to sprites/dlc1/XRG7K0.png diff --git a/sprites/dlc/XRG7L0.png b/sprites/dlc1/XRG7L0.png similarity index 100% rename from sprites/dlc/XRG7L0.png rename to sprites/dlc1/XRG7L0.png diff --git a/sprites/dlc/XRG7M0.png b/sprites/dlc1/XRG7M0.png similarity index 100% rename from sprites/dlc/XRG7M0.png rename to sprites/dlc1/XRG7M0.png diff --git a/sprites/dlc/XRG7N0.png b/sprites/dlc1/XRG7N0.png similarity index 100% rename from sprites/dlc/XRG7N0.png rename to sprites/dlc1/XRG7N0.png diff --git a/sprites/dlc/XRG7O0.png b/sprites/dlc1/XRG7O0.png similarity index 100% rename from sprites/dlc/XRG7O0.png rename to sprites/dlc1/XRG7O0.png diff --git a/sprites/dlc/XRG7P0.png b/sprites/dlc1/XRG7P0.png similarity index 100% rename from sprites/dlc/XRG7P0.png rename to sprites/dlc1/XRG7P0.png diff --git a/sprites/dlc/XRG7Q0.png b/sprites/dlc1/XRG7Q0.png similarity index 100% rename from sprites/dlc/XRG7Q0.png rename to sprites/dlc1/XRG7Q0.png diff --git a/sprites/dlc/XRG7R0.png b/sprites/dlc1/XRG7R0.png similarity index 100% rename from sprites/dlc/XRG7R0.png rename to sprites/dlc1/XRG7R0.png diff --git a/sprites/dlc/XRG7S0.png b/sprites/dlc1/XRG7S0.png similarity index 100% rename from sprites/dlc/XRG7S0.png rename to sprites/dlc1/XRG7S0.png diff --git a/sprites/dlc/XRG7T0.png b/sprites/dlc1/XRG7T0.png similarity index 100% rename from sprites/dlc/XRG7T0.png rename to sprites/dlc1/XRG7T0.png diff --git a/sprites/dlc/XRG7U0.png b/sprites/dlc1/XRG7U0.png similarity index 100% rename from sprites/dlc/XRG7U0.png rename to sprites/dlc1/XRG7U0.png diff --git a/sprites/dlc/XRG7V0.png b/sprites/dlc1/XRG7V0.png similarity index 100% rename from sprites/dlc/XRG7V0.png rename to sprites/dlc1/XRG7V0.png diff --git a/sprites/dlc/XRG7W0.png b/sprites/dlc1/XRG7W0.png similarity index 100% rename from sprites/dlc/XRG7W0.png rename to sprites/dlc1/XRG7W0.png diff --git a/sprites/dlc/XRG7X0.png b/sprites/dlc1/XRG7X0.png similarity index 100% rename from sprites/dlc/XRG7X0.png rename to sprites/dlc1/XRG7X0.png diff --git a/sprites/dlc/NSFLA0.png b/sprites/dlc2/NSFLA0.png similarity index 100% rename from sprites/dlc/NSFLA0.png rename to sprites/dlc2/NSFLA0.png diff --git a/sprites/dlc/NSFLB0.png b/sprites/dlc2/NSFLB0.png similarity index 100% rename from sprites/dlc/NSFLB0.png rename to sprites/dlc2/NSFLB0.png diff --git a/sprites/dlc/NSFLC0.png b/sprites/dlc2/NSFLC0.png similarity index 100% rename from sprites/dlc/NSFLC0.png rename to sprites/dlc2/NSFLC0.png diff --git a/sprites/dlc/RFXPA0.png b/sprites/dlc2/RFXPA0.png similarity index 100% rename from sprites/dlc/RFXPA0.png rename to sprites/dlc2/RFXPA0.png diff --git a/sprites/dlc/RFXPB0.png b/sprites/dlc2/RFXPB0.png similarity index 100% rename from sprites/dlc/RFXPB0.png rename to sprites/dlc2/RFXPB0.png diff --git a/sprites/dlc/RFXPC0.png b/sprites/dlc2/RFXPC0.png similarity index 100% rename from sprites/dlc/RFXPC0.png rename to sprites/dlc2/RFXPC0.png diff --git a/sprites/dlc/RFXPD0.png b/sprites/dlc2/RFXPD0.png similarity index 100% rename from sprites/dlc/RFXPD0.png rename to sprites/dlc2/RFXPD0.png diff --git a/sprites/dlc/RFXPE0.png b/sprites/dlc2/RFXPE0.png similarity index 100% rename from sprites/dlc/RFXPE0.png rename to sprites/dlc2/RFXPE0.png diff --git a/sprites/dlc/RFXPF0.png b/sprites/dlc2/RFXPF0.png similarity index 100% rename from sprites/dlc/RFXPF0.png rename to sprites/dlc2/RFXPF0.png diff --git a/sprites/dlc/RFXPG0.png b/sprites/dlc2/RFXPG0.png similarity index 100% rename from sprites/dlc/RFXPG0.png rename to sprites/dlc2/RFXPG0.png diff --git a/sprites/dlc/RFXPH0.png b/sprites/dlc2/RFXPH0.png similarity index 100% rename from sprites/dlc/RFXPH0.png rename to sprites/dlc2/RFXPH0.png diff --git a/sprites/dlc/RFXPI0.png b/sprites/dlc2/RFXPI0.png similarity index 100% rename from sprites/dlc/RFXPI0.png rename to sprites/dlc2/RFXPI0.png diff --git a/sprites/dlc/RFXPJ0.png b/sprites/dlc2/RFXPJ0.png similarity index 100% rename from sprites/dlc/RFXPJ0.png rename to sprites/dlc2/RFXPJ0.png diff --git a/sprites/dlc/RFXPK0.png b/sprites/dlc2/RFXPK0.png similarity index 100% rename from sprites/dlc/RFXPK0.png rename to sprites/dlc2/RFXPK0.png diff --git a/sprites/dlc/RFXPL0.png b/sprites/dlc2/RFXPL0.png similarity index 100% rename from sprites/dlc/RFXPL0.png rename to sprites/dlc2/RFXPL0.png diff --git a/sprites/dlc/RFXPM0.png b/sprites/dlc2/RFXPM0.png similarity index 100% rename from sprites/dlc/RFXPM0.png rename to sprites/dlc2/RFXPM0.png diff --git a/sprites/dlc/RFXPN0.png b/sprites/dlc2/RFXPN0.png similarity index 100% rename from sprites/dlc/RFXPN0.png rename to sprites/dlc2/RFXPN0.png diff --git a/sprites/dlc/RFXPO0.png b/sprites/dlc2/RFXPO0.png similarity index 100% rename from sprites/dlc/RFXPO0.png rename to sprites/dlc2/RFXPO0.png diff --git a/sprites/dlc/RFXPP0.png b/sprites/dlc2/RFXPP0.png similarity index 100% rename from sprites/dlc/RFXPP0.png rename to sprites/dlc2/RFXPP0.png diff --git a/sprites/dlc/RFXPQ0.png b/sprites/dlc2/RFXPQ0.png similarity index 100% rename from sprites/dlc/RFXPQ0.png rename to sprites/dlc2/RFXPQ0.png diff --git a/sprites/dlc/RFXPR0.png b/sprites/dlc2/RFXPR0.png similarity index 100% rename from sprites/dlc/RFXPR0.png rename to sprites/dlc2/RFXPR0.png diff --git a/sprites/dlc/RFXPS0.png b/sprites/dlc2/RFXPS0.png similarity index 100% rename from sprites/dlc/RFXPS0.png rename to sprites/dlc2/RFXPS0.png diff --git a/sprites/dlc/RFXPT0.png b/sprites/dlc2/RFXPT0.png similarity index 100% rename from sprites/dlc/RFXPT0.png rename to sprites/dlc2/RFXPT0.png diff --git a/sprites/dlc/RFXPU0.png b/sprites/dlc2/RFXPU0.png similarity index 100% rename from sprites/dlc/RFXPU0.png rename to sprites/dlc2/RFXPU0.png diff --git a/sprites/dlc/RFXPV0.png b/sprites/dlc2/RFXPV0.png similarity index 100% rename from sprites/dlc/RFXPV0.png rename to sprites/dlc2/RFXPV0.png diff --git a/sprites/dlc/RFXPW0.png b/sprites/dlc2/RFXPW0.png similarity index 100% rename from sprites/dlc/RFXPW0.png rename to sprites/dlc2/RFXPW0.png diff --git a/sprites/dlc/RFXPX0.png b/sprites/dlc2/RFXPX0.png similarity index 100% rename from sprites/dlc/RFXPX0.png rename to sprites/dlc2/RFXPX0.png diff --git a/sprites/dlc/RFXPY0.png b/sprites/dlc2/RFXPY0.png similarity index 100% rename from sprites/dlc/RFXPY0.png rename to sprites/dlc2/RFXPY0.png diff --git a/sprites/dlc/RFXPZ0.png b/sprites/dlc2/RFXPZ0.png similarity index 100% rename from sprites/dlc/RFXPZ0.png rename to sprites/dlc2/RFXPZ0.png diff --git a/sprites/dlc/RFXP[0.png b/sprites/dlc2/RFXP[0.png similarity index 100% rename from sprites/dlc/RFXP[0.png rename to sprites/dlc2/RFXP[0.png diff --git a/sprites/dlc/RFXP^0.png b/sprites/dlc2/RFXP^0.png similarity index 100% rename from sprites/dlc/RFXP^0.png rename to sprites/dlc2/RFXP^0.png diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 04e31d1b1..2298a4ff8 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -876,28 +876,35 @@ Class SWWMStatusBar : BaseStatusBar if ( swwm_targettags || targ.myplayer && (tag != "") ) Screen.DrawText(fnt,col,(barpos.x+barsiz.x/2.-(fnt.StringWidth(tag)*hsb.x)/2.)/hsb.x,(barpos.y-fnt.GetHeight()*hsb.y)/hsb.y,tag,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); Screen.DrawTexture(EnemyBTex,false,barpos.x/hsb.x,barpos.y/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); - double ht = clamp(targ.intp.GetValue(),0,targ.maxhealth*10); + double ht = clamp(targ.intp.GetValue(),0,targ.maxhealth*100); double hw = (min(ht,targ.maxhealth)*50.)/targ.maxhealth; if ( targ.mytarget && (targ.mytarget.bInvulnerable || (targ.myplayer && (targ.myplayer.cheats&(CF_GODMODE|CF_GODMODE2))) || targ.mytarget.FindInventory("InvinciballPower")) ) { Screen.DrawTexture(EnemyHTex[4],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); - continue; } - Screen.DrawTexture(EnemyHTex[0],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); - if ( ht > targ.maxhealth ) + else { - hw = (min(ht-targ.maxhealth,targ.maxhealth)*50.)/targ.maxhealth; - Screen.DrawTexture(EnemyHTex[1],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + Screen.DrawTexture(EnemyHTex[0],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + if ( ht > targ.maxhealth ) + { + hw = (min(ht-targ.maxhealth,targ.maxhealth)*50.)/targ.maxhealth; + Screen.DrawTexture(EnemyHTex[1],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + } + if ( ht > targ.maxhealth*2 ) + { + hw = (min(ht-targ.maxhealth*2,targ.maxhealth*3)*50.)/(targ.maxhealth*3); + Screen.DrawTexture(EnemyHTex[2],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + } + if ( ht > targ.maxhealth*5 ) + { + hw = (min(ht-targ.maxhealth*5,targ.maxhealth*5)*50.)/(targ.maxhealth*5); + Screen.DrawTexture(EnemyHTex[3],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + } } - if ( ht > targ.maxhealth*2 ) + if ( targ.mytarget && targ.mytarget.FindInventory("DivineSpriteEffect") ) { - hw = (min(ht-targ.maxhealth*2,targ.maxhealth*3)*50.)/(targ.maxhealth*3); - Screen.DrawTexture(EnemyHTex[2],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); - } - if ( ht > targ.maxhealth*5 ) - { - hw = (min(ht-targ.maxhealth*5,targ.maxhealth*5)*50.)/(targ.maxhealth*5); - Screen.DrawTexture(EnemyHTex[3],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph,DTA_WindowRightF,hw,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); + double falph = clamp((ht-targ.maxhealth*10)/(targ.maxhealth*60.),0.,1.); + Screen.DrawTexture(EnemyHTex[5],false,(barpos.x+2*hsb.x)/hsb.x,(barpos.y+2*hsb.y)/hsb.y,DTA_VirtualWidthF,ssb.x,DTA_VirtualHeightF,ssb.y,DTA_KeepRatio,true,DTA_Alpha,alph*falph,DTA_LegacyRenderStyle,STYLE_Add,DTA_ClipTop,cliptop,DTA_ClipBottom,clipbottom,DTA_ClipLeft,clipleft,DTA_ClipRight,clipright); } } // floating kill scores and others diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 9819a25dd..226196f62 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -994,13 +994,13 @@ Class Demolitionist : PlayerPawn } else if ( health > 500 ) { - if ( !FindInventory("GrilledCheeseSafeguard") && !(healtimer%5) ) + if ( !FindInventory("GrilledCheeseSafeguard") && !(healtimer%3) ) A_SetHealth(health-1); if ( health <= 500 ) healcooldown = 20; } else if ( health > 200 ) { - if ( !FindInventory("RefresherRegen") && !(healtimer%15) ) + if ( !FindInventory("RefresherRegen") && !(healtimer%12) ) A_SetHealth(health-1); } healtimer++; @@ -1179,7 +1179,15 @@ Class Demolitionist : PlayerPawn dashcooldown = max(0,dashcooldown-1); boostcooldown = max(0,boostcooldown-1); if ( fuelcooldown <= 0 ) + { + double oldfuel = dashfuel; dashfuel = min(default.dashfuel,dashfuel+clamp(dashfuel*.025,.1,3.)); + // stops + if ( (oldfuel < (default.dashfuel/24)) && (dashfuel >= default.dashfuel/24) ) + fuelcooldown = 20; + else if ( (oldfuel < (default.dashfuel/12)) && (dashfuel >= default.dashfuel/12) ) + fuelcooldown = 10; + } if ( ((dashboost <= 0) || !(isdashing || (isboosting && player.cmd.buttons&BT_JUMP))) && IsActorPlayingSound(CHAN_JETPACK,"demolitionist/jet") ) A_StartSound("demolitionist/jetstop",CHAN_JETPACK); PainChance = isdashing?0:255;