diff --git a/FuturePlans.md b/FuturePlans.md index aaa39f3f9..9d60d8fc7 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -5,8 +5,8 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add later More weapons, because we need 'em. In addition, all the "easy to implement" minigames, because the rest can wait until 1.5. * ☐ **DLC Weaponset:** - - [1] Itamex Reinforced Hammer *(UnSX 5)* - - HAHA DAB *(Gib 200 enemies with the Itamex Hammer)* + - ✓ [1] Itamex Reinforced Hammer *(UnSX 5)* + - ✓ HAHA DAB *(Gib 200 enemies with the Itamex Hammer)* - [2] Plasma Blaster *(SWWM)* - Blastin' Plasma *(Kill an enemy at full health with a Plasma Blaster charged shot 50 times)* - [3] Puntzer Beta *(SWWM Iridium)* diff --git a/language.version b/language.version index 11a2c06c2..34a59e905 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r307 \cu(Fri 12 Aug 11:15:09 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r307 \cu(2022-08-12 11:15:09)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r308 \cu(Fri 12 Aug 14:48:33 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r308 \cu(2022-08-12 14:48:33)\c-"; diff --git a/modeldef.hammer b/modeldef.hammer index 586be1bd4..65178b60d 100644 --- a/modeldef.hammer +++ b/modeldef.hammer @@ -1,3 +1,18 @@ +Model "HammerRadiusShockwave" +{ + Path "models/extra" + Model 0 "flat_d.3d" + Skin 0 "Shockwave.png" + Scale 1.0 0.06 0.015 + RollOffset 90 + AngleOffset 90 + ZOffset 4 + USEACTORPITCH + DONTCULLBACKFACES + + FrameIndex XZW1 A 0 0 +} + Model "ItamexHammer" { Path "models" @@ -111,10 +126,10 @@ Model "ItamexHammer" FrameIndex XZW4 Y 1 79 FrameIndex XZW4 Z 1 80 FrameIndex XZW5 A 1 81 - FrameIndex XZW5 B 1 82 + FrameIndex XZW5 B 1 82 // Hit FrameIndex XZW5 C 1 83 FrameIndex XZW5 D 1 84 - FrameIndex XZW5 E 1 85 + FrameIndex XZW5 E 1 85 // Slam FrameIndex XZW5 F 1 86 FrameIndex XZW5 G 1 87 FrameIndex XZW5 H 1 88 diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index c73a9d7a1..9d97fce58 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -9,7 +9,7 @@ Model "SheenTrail" USEACTORPITCH USEACTORROLL - Skin 0 "dlc/SheenTracer.png" + Skin 0 "SheenTracer.png" FrameIndex XZW1 A 0 0 } Model "SheenPhantom" @@ -87,7 +87,7 @@ Model "HeavyMahSheenGun" AngleOffset 90 Scale 0.12 0.12 0.12 - Skin 2 "dlc/SheenMuz0.png" + Skin 2 "SheenMuz0.png" PitchOffset 0 FrameIndex XZW0 A 2 0 PitchOffset 120 @@ -95,7 +95,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 C 2 0 Scale 0.11 0.11 0.11 - Skin 2 "dlc/SheenMuz1.png" + Skin 2 "SheenMuz1.png" PitchOffset 0 FrameIndex XZW0 D 2 0 PitchOffset 120 @@ -103,7 +103,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 F 2 0 Scale 0.10 0.10 0.10 - Skin 2 "dlc/SheenMuz2.png" + Skin 2 "SheenMuz2.png" PitchOffset 0 FrameIndex XZW0 G 2 0 PitchOffset 120 @@ -111,7 +111,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 I 2 0 Scale 0.09 0.09 0.09 - Skin 2 "dlc/SheenMuz3.png" + Skin 2 "SheenMuz3.png" PitchOffset 0 FrameIndex XZW0 J 2 0 PitchOffset 120 @@ -119,7 +119,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 L 2 0 Scale 0.08 0.08 0.08 - Skin 2 "dlc/SheenMuz4.png" + Skin 2 "SheenMuz4.png" PitchOffset 0 FrameIndex XZW0 M 2 0 PitchOffset 120 @@ -127,7 +127,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 O 2 0 Scale 0.07 0.07 0.07 - Skin 2 "dlc/SheenMuz5.png" + Skin 2 "SheenMuz5.png" PitchOffset 0 FrameIndex XZW0 P 2 0 PitchOffset 120 @@ -135,7 +135,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 R 2 0 Scale 0.06 0.06 0.06 - Skin 2 "dlc/SheenMuz6.png" + Skin 2 "SheenMuz6.png" PitchOffset 0 FrameIndex XZW0 S 2 0 PitchOffset 120 @@ -143,7 +143,7 @@ Model "HeavyMahSheenGun" PitchOffset 240 FrameIndex XZW0 U 2 0 Scale 0.05 0.05 0.05 - Skin 2 "dlc/SheenMuz7.png" + Skin 2 "SheenMuz7.png" PitchOffset 0 FrameIndex XZW0 V 2 0 PitchOffset 120 diff --git a/models/CombatHammer1st.blend b/models/CombatHammer1st.blend index a36abde7f..ba744ebcf 100644 Binary files a/models/CombatHammer1st.blend and b/models/CombatHammer1st.blend differ diff --git a/models/CombatHammer1st_a.3d b/models/CombatHammer1st_a.3d index 11e5ffe3d..af849d782 100644 Binary files a/models/CombatHammer1st_a.3d and b/models/CombatHammer1st_a.3d differ diff --git a/models/CombatHammer1st_d.3d b/models/CombatHammer1st_d.3d index 2456a7c74..3a129c3ea 100644 Binary files a/models/CombatHammer1st_d.3d and b/models/CombatHammer1st_d.3d differ diff --git a/models/extra/dlc/BlastMuz0.png b/models/extra/BlastMuz0.png similarity index 100% rename from models/extra/dlc/BlastMuz0.png rename to models/extra/BlastMuz0.png diff --git a/models/extra/dlc/BlastMuz1.png b/models/extra/BlastMuz1.png similarity index 100% rename from models/extra/dlc/BlastMuz1.png rename to models/extra/BlastMuz1.png diff --git a/models/extra/dlc/BlastMuz2.png b/models/extra/BlastMuz2.png similarity index 100% rename from models/extra/dlc/BlastMuz2.png rename to models/extra/BlastMuz2.png diff --git a/models/extra/dlc/BlastMuz3.png b/models/extra/BlastMuz3.png similarity index 100% rename from models/extra/dlc/BlastMuz3.png rename to models/extra/BlastMuz3.png diff --git a/models/extra/dlc/BlastMuz4.png b/models/extra/BlastMuz4.png similarity index 100% rename from models/extra/dlc/BlastMuz4.png rename to models/extra/BlastMuz4.png diff --git a/models/extra/dlc/BlastMuz5.png b/models/extra/BlastMuz5.png similarity index 100% rename from models/extra/dlc/BlastMuz5.png rename to models/extra/BlastMuz5.png diff --git a/models/extra/dlc/BlastMuz6.png b/models/extra/BlastMuz6.png similarity index 100% rename from models/extra/dlc/BlastMuz6.png rename to models/extra/BlastMuz6.png diff --git a/models/extra/dlc/BlastMuz7.png b/models/extra/BlastMuz7.png similarity index 100% rename from models/extra/dlc/BlastMuz7.png rename to models/extra/BlastMuz7.png diff --git a/models/extra/dlc/BlastMuz8.png b/models/extra/BlastMuz8.png similarity index 100% rename from models/extra/dlc/BlastMuz8.png rename to models/extra/BlastMuz8.png diff --git a/models/extra/dlc/BlastMuz9.png b/models/extra/BlastMuz9.png similarity index 100% rename from models/extra/dlc/BlastMuz9.png rename to models/extra/BlastMuz9.png diff --git a/models/extra/dlc/LanceTracer.png b/models/extra/LanceTracer.png similarity index 100% rename from models/extra/dlc/LanceTracer.png rename to models/extra/LanceTracer.png diff --git a/models/extra/dlc/MRBolt.png b/models/extra/MRBolt.png similarity index 100% rename from models/extra/dlc/MRBolt.png rename to models/extra/MRBolt.png diff --git a/models/extra/dlc/MRBoltS.png b/models/extra/MRBoltS.png similarity index 100% rename from models/extra/dlc/MRBoltS.png rename to models/extra/MRBoltS.png diff --git a/models/extra/dlc/MRMuz0.png b/models/extra/MRMuz0.png similarity index 100% rename from models/extra/dlc/MRMuz0.png rename to models/extra/MRMuz0.png diff --git a/models/extra/dlc/MRMuz1.png b/models/extra/MRMuz1.png similarity index 100% rename from models/extra/dlc/MRMuz1.png rename to models/extra/MRMuz1.png diff --git a/models/extra/dlc/MRMuz2.png b/models/extra/MRMuz2.png similarity index 100% rename from models/extra/dlc/MRMuz2.png rename to models/extra/MRMuz2.png diff --git a/models/extra/dlc/MRMuz3.png b/models/extra/MRMuz3.png similarity index 100% rename from models/extra/dlc/MRMuz3.png rename to models/extra/MRMuz3.png diff --git a/models/extra/NewSparkMuzK.png b/models/extra/NewSparkMuzK.png new file mode 100644 index 000000000..6872434ff Binary files /dev/null and b/models/extra/NewSparkMuzK.png differ diff --git a/models/extra/NewSparkMuzN.png b/models/extra/NewSparkMuzN.png new file mode 100644 index 000000000..0fea3ed13 Binary files /dev/null and b/models/extra/NewSparkMuzN.png differ diff --git a/models/extra/NewSparkMuzNK.png b/models/extra/NewSparkMuzNK.png new file mode 100644 index 000000000..e087e49fe Binary files /dev/null and b/models/extra/NewSparkMuzNK.png differ diff --git a/models/extra/dlc/PlasmaTracer.png b/models/extra/PlasmaTracer.png similarity index 100% rename from models/extra/dlc/PlasmaTracer.png rename to models/extra/PlasmaTracer.png diff --git a/models/extra/dlc/PlasmaTrail.png b/models/extra/PlasmaTrail.png similarity index 100% rename from models/extra/dlc/PlasmaTrail.png rename to models/extra/PlasmaTrail.png diff --git a/models/extra/dlc/PuntzerMuz0.png b/models/extra/PuntzerMuz0.png similarity index 100% rename from models/extra/dlc/PuntzerMuz0.png rename to models/extra/PuntzerMuz0.png diff --git a/models/extra/dlc/PuntzerMuz1.png b/models/extra/PuntzerMuz1.png similarity index 100% rename from models/extra/dlc/PuntzerMuz1.png rename to models/extra/PuntzerMuz1.png diff --git a/models/extra/dlc/PuntzerMuz2.png b/models/extra/PuntzerMuz2.png similarity index 100% rename from models/extra/dlc/PuntzerMuz2.png rename to models/extra/PuntzerMuz2.png diff --git a/models/extra/dlc/PuntzerMuz3.png b/models/extra/PuntzerMuz3.png similarity index 100% rename from models/extra/dlc/PuntzerMuz3.png rename to models/extra/PuntzerMuz3.png diff --git a/models/extra/dlc/PuntzerMuz4.png b/models/extra/PuntzerMuz4.png similarity index 100% rename from models/extra/dlc/PuntzerMuz4.png rename to models/extra/PuntzerMuz4.png diff --git a/models/extra/dlc/PuntzerMuz5.png b/models/extra/PuntzerMuz5.png similarity index 100% rename from models/extra/dlc/PuntzerMuz5.png rename to models/extra/PuntzerMuz5.png diff --git a/models/extra/dlc/PuntzerMuz6.png b/models/extra/PuntzerMuz6.png similarity index 100% rename from models/extra/dlc/PuntzerMuz6.png rename to models/extra/PuntzerMuz6.png diff --git a/models/extra/dlc/PuntzerMuz7.png b/models/extra/PuntzerMuz7.png similarity index 100% rename from models/extra/dlc/PuntzerMuz7.png rename to models/extra/PuntzerMuz7.png diff --git a/models/extra/dlc/QuadMuz0.png b/models/extra/QuadMuz0.png similarity index 100% rename from models/extra/dlc/QuadMuz0.png rename to models/extra/QuadMuz0.png diff --git a/models/extra/dlc/QuadMuz1.png b/models/extra/QuadMuz1.png similarity index 100% rename from models/extra/dlc/QuadMuz1.png rename to models/extra/QuadMuz1.png diff --git a/models/extra/dlc/QuadMuz2.png b/models/extra/QuadMuz2.png similarity index 100% rename from models/extra/dlc/QuadMuz2.png rename to models/extra/QuadMuz2.png diff --git a/models/extra/dlc/QuadMuz3.png b/models/extra/QuadMuz3.png similarity index 100% rename from models/extra/dlc/QuadMuz3.png rename to models/extra/QuadMuz3.png diff --git a/models/extra/dlc/QuadMuz4.png b/models/extra/QuadMuz4.png similarity index 100% rename from models/extra/dlc/QuadMuz4.png rename to models/extra/QuadMuz4.png diff --git a/models/extra/dlc/QuadMuz5.png b/models/extra/QuadMuz5.png similarity index 100% rename from models/extra/dlc/QuadMuz5.png rename to models/extra/QuadMuz5.png diff --git a/models/extra/dlc/QuadMuz6.png b/models/extra/QuadMuz6.png similarity index 100% rename from models/extra/dlc/QuadMuz6.png rename to models/extra/QuadMuz6.png diff --git a/models/extra/dlc/QuadMuz7.png b/models/extra/QuadMuz7.png similarity index 100% rename from models/extra/dlc/QuadMuz7.png rename to models/extra/QuadMuz7.png diff --git a/models/extra/dlc/QuadMuz8.png b/models/extra/QuadMuz8.png similarity index 100% rename from models/extra/dlc/QuadMuz8.png rename to models/extra/QuadMuz8.png diff --git a/models/extra/dlc/QuadMuz9.png b/models/extra/QuadMuz9.png similarity index 100% rename from models/extra/dlc/QuadMuz9.png rename to models/extra/QuadMuz9.png diff --git a/models/extra/dlc/RailMuz0.png b/models/extra/RailMuz0.png similarity index 100% rename from models/extra/dlc/RailMuz0.png rename to models/extra/RailMuz0.png diff --git a/models/extra/dlc/RailMuz1.png b/models/extra/RailMuz1.png similarity index 100% rename from models/extra/dlc/RailMuz1.png rename to models/extra/RailMuz1.png diff --git a/models/extra/dlc/RailMuz2.png b/models/extra/RailMuz2.png similarity index 100% rename from models/extra/dlc/RailMuz2.png rename to models/extra/RailMuz2.png diff --git a/models/extra/dlc/RailMuz3.png b/models/extra/RailMuz3.png similarity index 100% rename from models/extra/dlc/RailMuz3.png rename to models/extra/RailMuz3.png diff --git a/models/extra/dlc/RayTracer.png b/models/extra/RayTracer.png similarity index 100% rename from models/extra/dlc/RayTracer.png rename to models/extra/RayTracer.png diff --git a/models/extra/dlc/RayTrail.png b/models/extra/RayTrail.png similarity index 100% rename from models/extra/dlc/RayTrail.png rename to models/extra/RayTrail.png diff --git a/models/extra/dlc/SheenMuz0.png b/models/extra/SheenMuz0.png similarity index 100% rename from models/extra/dlc/SheenMuz0.png rename to models/extra/SheenMuz0.png diff --git a/models/extra/dlc/SheenMuz1.png b/models/extra/SheenMuz1.png similarity index 100% rename from models/extra/dlc/SheenMuz1.png rename to models/extra/SheenMuz1.png diff --git a/models/extra/dlc/SheenMuz2.png b/models/extra/SheenMuz2.png similarity index 100% rename from models/extra/dlc/SheenMuz2.png rename to models/extra/SheenMuz2.png diff --git a/models/extra/dlc/SheenMuz3.png b/models/extra/SheenMuz3.png similarity index 100% rename from models/extra/dlc/SheenMuz3.png rename to models/extra/SheenMuz3.png diff --git a/models/extra/dlc/SheenMuz4.png b/models/extra/SheenMuz4.png similarity index 100% rename from models/extra/dlc/SheenMuz4.png rename to models/extra/SheenMuz4.png diff --git a/models/extra/dlc/SheenMuz5.png b/models/extra/SheenMuz5.png similarity index 100% rename from models/extra/dlc/SheenMuz5.png rename to models/extra/SheenMuz5.png diff --git a/models/extra/dlc/SheenMuz6.png b/models/extra/SheenMuz6.png similarity index 100% rename from models/extra/dlc/SheenMuz6.png rename to models/extra/SheenMuz6.png diff --git a/models/extra/dlc/SheenMuz7.png b/models/extra/SheenMuz7.png similarity index 100% rename from models/extra/dlc/SheenMuz7.png rename to models/extra/SheenMuz7.png diff --git a/models/extra/dlc/SheenTracer.png b/models/extra/SheenTracer.png similarity index 100% rename from models/extra/dlc/SheenTracer.png rename to models/extra/SheenTracer.png diff --git a/models/extra/dlc/UltimaMuz0.png b/models/extra/UltimaMuz0.png similarity index 100% rename from models/extra/dlc/UltimaMuz0.png rename to models/extra/UltimaMuz0.png diff --git a/models/extra/dlc/UltimaMuz1.png b/models/extra/UltimaMuz1.png similarity index 100% rename from models/extra/dlc/UltimaMuz1.png rename to models/extra/UltimaMuz1.png diff --git a/models/extra/dlc/UltimaMuz2.png b/models/extra/UltimaMuz2.png similarity index 100% rename from models/extra/dlc/UltimaMuz2.png rename to models/extra/UltimaMuz2.png diff --git a/models/extra/dlc/UltimaMuz3.png b/models/extra/UltimaMuz3.png similarity index 100% rename from models/extra/dlc/UltimaMuz3.png rename to models/extra/UltimaMuz3.png diff --git a/models/extra/dlc/UltimaTrail.png b/models/extra/UltimaTrail.png similarity index 100% rename from models/extra/dlc/UltimaTrail.png rename to models/extra/UltimaTrail.png diff --git a/models/extra/dlc/NewSparkMuzK.png b/models/extra/dlc/NewSparkMuzK.png deleted file mode 100644 index c53667361..000000000 Binary files a/models/extra/dlc/NewSparkMuzK.png and /dev/null differ diff --git a/models/extra/dlc/NewSparkMuzN.png b/models/extra/dlc/NewSparkMuzN.png deleted file mode 100644 index 0b02a5a9c..000000000 Binary files a/models/extra/dlc/NewSparkMuzN.png and /dev/null differ diff --git a/models/extra/dlc/NewSparkMuzNK.png b/models/extra/dlc/NewSparkMuzNK.png deleted file mode 100644 index 8f9a0ade7..000000000 Binary files a/models/extra/dlc/NewSparkMuzNK.png and /dev/null differ diff --git a/sprites/dlc/BFXXA0.png b/sprites/BFXXA0.png similarity index 100% rename from sprites/dlc/BFXXA0.png rename to sprites/BFXXA0.png diff --git a/sprites/dlc/BFXXB0.png b/sprites/BFXXB0.png similarity index 100% rename from sprites/dlc/BFXXB0.png rename to sprites/BFXXB0.png diff --git a/sprites/dlc/BFXXC0.png b/sprites/BFXXC0.png similarity index 100% rename from sprites/dlc/BFXXC0.png rename to sprites/BFXXC0.png diff --git a/sprites/dlc/BFXXD0.png b/sprites/BFXXD0.png similarity index 100% rename from sprites/dlc/BFXXD0.png rename to sprites/BFXXD0.png diff --git a/sprites/dlc/BFXXE0.png b/sprites/BFXXE0.png similarity index 100% rename from sprites/dlc/BFXXE0.png rename to sprites/BFXXE0.png diff --git a/sprites/dlc/BFXXF0.png b/sprites/BFXXF0.png similarity index 100% rename from sprites/dlc/BFXXF0.png rename to sprites/BFXXF0.png diff --git a/sprites/dlc/BFXXG0.png b/sprites/BFXXG0.png similarity index 100% rename from sprites/dlc/BFXXG0.png rename to sprites/BFXXG0.png diff --git a/sprites/dlc/BFXXH0.png b/sprites/BFXXH0.png similarity index 100% rename from sprites/dlc/BFXXH0.png rename to sprites/BFXXH0.png diff --git a/sprites/dlc/BFXXI0.png b/sprites/BFXXI0.png similarity index 100% rename from sprites/dlc/BFXXI0.png rename to sprites/BFXXI0.png diff --git a/sprites/dlc/BFXXJ0.png b/sprites/BFXXJ0.png similarity index 100% rename from sprites/dlc/BFXXJ0.png rename to sprites/BFXXJ0.png diff --git a/sprites/dlc/BFXXK0.png b/sprites/BFXXK0.png similarity index 100% rename from sprites/dlc/BFXXK0.png rename to sprites/BFXXK0.png diff --git a/sprites/dlc/BFXXL0.png b/sprites/BFXXL0.png similarity index 100% rename from sprites/dlc/BFXXL0.png rename to sprites/BFXXL0.png diff --git a/sprites/dlc/BFXXM0.png b/sprites/BFXXM0.png similarity index 100% rename from sprites/dlc/BFXXM0.png rename to sprites/BFXXM0.png diff --git a/sprites/dlc/BFXXN0.png b/sprites/BFXXN0.png similarity index 100% rename from sprites/dlc/BFXXN0.png rename to sprites/BFXXN0.png diff --git a/sprites/dlc/BFXXO0.png b/sprites/BFXXO0.png similarity index 100% rename from sprites/dlc/BFXXO0.png rename to sprites/BFXXO0.png diff --git a/sprites/dlc/BFXXP0.png b/sprites/BFXXP0.png similarity index 100% rename from sprites/dlc/BFXXP0.png rename to sprites/BFXXP0.png diff --git a/sprites/dlc/BFXXQ0.png b/sprites/BFXXQ0.png similarity index 100% rename from sprites/dlc/BFXXQ0.png rename to sprites/BFXXQ0.png diff --git a/sprites/dlc/BFXXR0.png b/sprites/BFXXR0.png similarity index 100% rename from sprites/dlc/BFXXR0.png rename to sprites/BFXXR0.png diff --git a/sprites/dlc/BFXXS0.png b/sprites/BFXXS0.png similarity index 100% rename from sprites/dlc/BFXXS0.png rename to sprites/BFXXS0.png diff --git a/sprites/dlc/BFXXT0.png b/sprites/BFXXT0.png similarity index 100% rename from sprites/dlc/BFXXT0.png rename to sprites/BFXXT0.png diff --git a/sprites/dlc/NSFLA0.png b/sprites/NSFLA0.png similarity index 100% rename from sprites/dlc/NSFLA0.png rename to sprites/NSFLA0.png diff --git a/sprites/dlc/NSFLB0.png b/sprites/NSFLB0.png similarity index 100% rename from sprites/dlc/NSFLB0.png rename to sprites/NSFLB0.png diff --git a/sprites/dlc/NSFLC0.png b/sprites/NSFLC0.png similarity index 100% rename from sprites/dlc/NSFLC0.png rename to sprites/NSFLC0.png diff --git a/sprites/dlc/PBBLA0.png b/sprites/PBBLA0.png similarity index 100% rename from sprites/dlc/PBBLA0.png rename to sprites/PBBLA0.png diff --git a/sprites/dlc/PBBLB0.png b/sprites/PBBLB0.png similarity index 100% rename from sprites/dlc/PBBLB0.png rename to sprites/PBBLB0.png diff --git a/sprites/dlc/PBBLC0.png b/sprites/PBBLC0.png similarity index 100% rename from sprites/dlc/PBBLC0.png rename to sprites/PBBLC0.png diff --git a/sprites/dlc/PBBLD0.png b/sprites/PBBLD0.png similarity index 100% rename from sprites/dlc/PBBLD0.png rename to sprites/PBBLD0.png diff --git a/sprites/dlc/PBBLE0.png b/sprites/PBBLE0.png similarity index 100% rename from sprites/dlc/PBBLE0.png rename to sprites/PBBLE0.png diff --git a/sprites/dlc/PBBLF0.png b/sprites/PBBLF0.png similarity index 100% rename from sprites/dlc/PBBLF0.png rename to sprites/PBBLF0.png diff --git a/sprites/dlc/PBBLG0.png b/sprites/PBBLG0.png similarity index 100% rename from sprites/dlc/PBBLG0.png rename to sprites/PBBLG0.png diff --git a/sprites/dlc/PBBLH0.png b/sprites/PBBLH0.png similarity index 100% rename from sprites/dlc/PBBLH0.png rename to sprites/PBBLH0.png diff --git a/sprites/dlc/PBBLI0.png b/sprites/PBBLI0.png similarity index 100% rename from sprites/dlc/PBBLI0.png rename to sprites/PBBLI0.png diff --git a/sprites/dlc/PBBLJ0.png b/sprites/PBBLJ0.png similarity index 100% rename from sprites/dlc/PBBLJ0.png rename to sprites/PBBLJ0.png diff --git a/sprites/dlc/PBMBA0.png b/sprites/PBMBA0.png similarity index 100% rename from sprites/dlc/PBMBA0.png rename to sprites/PBMBA0.png diff --git a/sprites/dlc/PBMBB0.png b/sprites/PBMBB0.png similarity index 100% rename from sprites/dlc/PBMBB0.png rename to sprites/PBMBB0.png diff --git a/sprites/dlc/PBMBC0.png b/sprites/PBMBC0.png similarity index 100% rename from sprites/dlc/PBMBC0.png rename to sprites/PBMBC0.png diff --git a/sprites/dlc/PBMBD0.png b/sprites/PBMBD0.png similarity index 100% rename from sprites/dlc/PBMBD0.png rename to sprites/PBMBD0.png diff --git a/sprites/dlc/PBMBE0.png b/sprites/PBMBE0.png similarity index 100% rename from sprites/dlc/PBMBE0.png rename to sprites/PBMBE0.png diff --git a/sprites/dlc/PBMBF0.png b/sprites/PBMBF0.png similarity index 100% rename from sprites/dlc/PBMBF0.png rename to sprites/PBMBF0.png diff --git a/sprites/dlc/PBMBG0.png b/sprites/PBMBG0.png similarity index 100% rename from sprites/dlc/PBMBG0.png rename to sprites/PBMBG0.png diff --git a/sprites/dlc/PBMBH0.png b/sprites/PBMBH0.png similarity index 100% rename from sprites/dlc/PBMBH0.png rename to sprites/PBMBH0.png diff --git a/sprites/dlc/PBMBI0.png b/sprites/PBMBI0.png similarity index 100% rename from sprites/dlc/PBMBI0.png rename to sprites/PBMBI0.png diff --git a/sprites/dlc/PBMBJ0.png b/sprites/PBMBJ0.png similarity index 100% rename from sprites/dlc/PBMBJ0.png rename to sprites/PBMBJ0.png diff --git a/sprites/dlc/PBMBK0.png b/sprites/PBMBK0.png similarity index 100% rename from sprites/dlc/PBMBK0.png rename to sprites/PBMBK0.png diff --git a/sprites/dlc/PBMBL0.png b/sprites/PBMBL0.png similarity index 100% rename from sprites/dlc/PBMBL0.png rename to sprites/PBMBL0.png diff --git a/sprites/dlc/QEMBA0.png b/sprites/QEMBA0.png similarity index 100% rename from sprites/dlc/QEMBA0.png rename to sprites/QEMBA0.png diff --git a/sprites/dlc/QEMBB0.png b/sprites/QEMBB0.png similarity index 100% rename from sprites/dlc/QEMBB0.png rename to sprites/QEMBB0.png diff --git a/sprites/dlc/QEMBC0.png b/sprites/QEMBC0.png similarity index 100% rename from sprites/dlc/QEMBC0.png rename to sprites/QEMBC0.png diff --git a/sprites/dlc/QEMBD0.png b/sprites/QEMBD0.png similarity index 100% rename from sprites/dlc/QEMBD0.png rename to sprites/QEMBD0.png diff --git a/sprites/dlc/QEMBE0.png b/sprites/QEMBE0.png similarity index 100% rename from sprites/dlc/QEMBE0.png rename to sprites/QEMBE0.png diff --git a/sprites/dlc/QFBLA0.png b/sprites/QFBLA0.png similarity index 100% rename from sprites/dlc/QFBLA0.png rename to sprites/QFBLA0.png diff --git a/sprites/dlc/QFBLB0.png b/sprites/QFBLB0.png similarity index 100% rename from sprites/dlc/QFBLB0.png rename to sprites/QFBLB0.png diff --git a/sprites/dlc/QFBLC0.png b/sprites/QFBLC0.png similarity index 100% rename from sprites/dlc/QFBLC0.png rename to sprites/QFBLC0.png diff --git a/sprites/dlc/QFBLD0.png b/sprites/QFBLD0.png similarity index 100% rename from sprites/dlc/QFBLD0.png rename to sprites/QFBLD0.png diff --git a/sprites/dlc/QFBLE0.png b/sprites/QFBLE0.png similarity index 100% rename from sprites/dlc/QFBLE0.png rename to sprites/QFBLE0.png diff --git a/sprites/dlc/QFBLF0.png b/sprites/QFBLF0.png similarity index 100% rename from sprites/dlc/QFBLF0.png rename to sprites/QFBLF0.png diff --git a/sprites/dlc/QFBLG0.png b/sprites/QFBLG0.png similarity index 100% rename from sprites/dlc/QFBLG0.png rename to sprites/QFBLG0.png diff --git a/sprites/dlc/QFBLH0.png b/sprites/QFBLH0.png similarity index 100% rename from sprites/dlc/QFBLH0.png rename to sprites/QFBLH0.png diff --git a/sprites/dlc/QFBLI0.png b/sprites/QFBLI0.png similarity index 100% rename from sprites/dlc/QFBLI0.png rename to sprites/QFBLI0.png diff --git a/sprites/dlc/QFBLJ0.png b/sprites/QFBLJ0.png similarity index 100% rename from sprites/dlc/QFBLJ0.png rename to sprites/QFBLJ0.png diff --git a/sprites/dlc/QFLRA0.png b/sprites/QFLRA0.png similarity index 100% rename from sprites/dlc/QFLRA0.png rename to sprites/QFLRA0.png diff --git a/sprites/dlc/RAYTA0.png b/sprites/RAYTA0.png similarity index 100% rename from sprites/dlc/RAYTA0.png rename to sprites/RAYTA0.png diff --git a/sprites/dlc/RAYTB0.png b/sprites/RAYTB0.png similarity index 100% rename from sprites/dlc/RAYTB0.png rename to sprites/RAYTB0.png diff --git a/sprites/dlc/RAYTC0.png b/sprites/RAYTC0.png similarity index 100% rename from sprites/dlc/RAYTC0.png rename to sprites/RAYTC0.png diff --git a/sprites/dlc/RAYTD0.png b/sprites/RAYTD0.png similarity index 100% rename from sprites/dlc/RAYTD0.png rename to sprites/RAYTD0.png diff --git a/sprites/dlc/RAYTE0.png b/sprites/RAYTE0.png similarity index 100% rename from sprites/dlc/RAYTE0.png rename to sprites/RAYTE0.png diff --git a/sprites/dlc/RAYTF0.png b/sprites/RAYTF0.png similarity index 100% rename from sprites/dlc/RAYTF0.png rename to sprites/RAYTF0.png diff --git a/sprites/dlc/RAYTG0.png b/sprites/RAYTG0.png similarity index 100% rename from sprites/dlc/RAYTG0.png rename to sprites/RAYTG0.png diff --git a/sprites/dlc/RAYTH0.png b/sprites/RAYTH0.png similarity index 100% rename from sprites/dlc/RAYTH0.png rename to sprites/RAYTH0.png diff --git a/sprites/dlc/RAYTI0.png b/sprites/RAYTI0.png similarity index 100% rename from sprites/dlc/RAYTI0.png rename to sprites/RAYTI0.png diff --git a/sprites/dlc/RAYTJ0.png b/sprites/RAYTJ0.png similarity index 100% rename from sprites/dlc/RAYTJ0.png rename to sprites/RAYTJ0.png diff --git a/sprites/dlc/RAYTK0.png b/sprites/RAYTK0.png similarity index 100% rename from sprites/dlc/RAYTK0.png rename to sprites/RAYTK0.png diff --git a/sprites/dlc/RFXPA0.png b/sprites/RFXPA0.png similarity index 100% rename from sprites/dlc/RFXPA0.png rename to sprites/RFXPA0.png diff --git a/sprites/dlc/RFXPB0.png b/sprites/RFXPB0.png similarity index 100% rename from sprites/dlc/RFXPB0.png rename to sprites/RFXPB0.png diff --git a/sprites/dlc/RFXPC0.png b/sprites/RFXPC0.png similarity index 100% rename from sprites/dlc/RFXPC0.png rename to sprites/RFXPC0.png diff --git a/sprites/dlc/RFXPD0.png b/sprites/RFXPD0.png similarity index 100% rename from sprites/dlc/RFXPD0.png rename to sprites/RFXPD0.png diff --git a/sprites/dlc/RFXPE0.png b/sprites/RFXPE0.png similarity index 100% rename from sprites/dlc/RFXPE0.png rename to sprites/RFXPE0.png diff --git a/sprites/dlc/RFXPF0.png b/sprites/RFXPF0.png similarity index 100% rename from sprites/dlc/RFXPF0.png rename to sprites/RFXPF0.png diff --git a/sprites/dlc/RFXPG0.png b/sprites/RFXPG0.png similarity index 100% rename from sprites/dlc/RFXPG0.png rename to sprites/RFXPG0.png diff --git a/sprites/dlc/RFXPH0.png b/sprites/RFXPH0.png similarity index 100% rename from sprites/dlc/RFXPH0.png rename to sprites/RFXPH0.png diff --git a/sprites/dlc/RFXPI0.png b/sprites/RFXPI0.png similarity index 100% rename from sprites/dlc/RFXPI0.png rename to sprites/RFXPI0.png diff --git a/sprites/dlc/RFXPJ0.png b/sprites/RFXPJ0.png similarity index 100% rename from sprites/dlc/RFXPJ0.png rename to sprites/RFXPJ0.png diff --git a/sprites/dlc/RFXPK0.png b/sprites/RFXPK0.png similarity index 100% rename from sprites/dlc/RFXPK0.png rename to sprites/RFXPK0.png diff --git a/sprites/dlc/RFXPL0.png b/sprites/RFXPL0.png similarity index 100% rename from sprites/dlc/RFXPL0.png rename to sprites/RFXPL0.png diff --git a/sprites/dlc/RFXPM0.png b/sprites/RFXPM0.png similarity index 100% rename from sprites/dlc/RFXPM0.png rename to sprites/RFXPM0.png diff --git a/sprites/dlc/RFXPN0.png b/sprites/RFXPN0.png similarity index 100% rename from sprites/dlc/RFXPN0.png rename to sprites/RFXPN0.png diff --git a/sprites/dlc/RFXPO0.png b/sprites/RFXPO0.png similarity index 100% rename from sprites/dlc/RFXPO0.png rename to sprites/RFXPO0.png diff --git a/sprites/dlc/RFXPP0.png b/sprites/RFXPP0.png similarity index 100% rename from sprites/dlc/RFXPP0.png rename to sprites/RFXPP0.png diff --git a/sprites/dlc/RFXPQ0.png b/sprites/RFXPQ0.png similarity index 100% rename from sprites/dlc/RFXPQ0.png rename to sprites/RFXPQ0.png diff --git a/sprites/dlc/RFXPR0.png b/sprites/RFXPR0.png similarity index 100% rename from sprites/dlc/RFXPR0.png rename to sprites/RFXPR0.png diff --git a/sprites/dlc/RFXPS0.png b/sprites/RFXPS0.png similarity index 100% rename from sprites/dlc/RFXPS0.png rename to sprites/RFXPS0.png diff --git a/sprites/dlc/RFXPT0.png b/sprites/RFXPT0.png similarity index 100% rename from sprites/dlc/RFXPT0.png rename to sprites/RFXPT0.png diff --git a/sprites/dlc/RFXPU0.png b/sprites/RFXPU0.png similarity index 100% rename from sprites/dlc/RFXPU0.png rename to sprites/RFXPU0.png diff --git a/sprites/dlc/RFXPV0.png b/sprites/RFXPV0.png similarity index 100% rename from sprites/dlc/RFXPV0.png rename to sprites/RFXPV0.png diff --git a/sprites/dlc/RFXPW0.png b/sprites/RFXPW0.png similarity index 100% rename from sprites/dlc/RFXPW0.png rename to sprites/RFXPW0.png diff --git a/sprites/dlc/RFXPX0.png b/sprites/RFXPX0.png similarity index 100% rename from sprites/dlc/RFXPX0.png rename to sprites/RFXPX0.png diff --git a/sprites/dlc/RFXPY0.png b/sprites/RFXPY0.png similarity index 100% rename from sprites/dlc/RFXPY0.png rename to sprites/RFXPY0.png diff --git a/sprites/dlc/RFXPZ0.png b/sprites/RFXPZ0.png similarity index 100% rename from sprites/dlc/RFXPZ0.png rename to sprites/RFXPZ0.png diff --git a/sprites/dlc/RFXP[0.png b/sprites/RFXP[0.png similarity index 100% rename from sprites/dlc/RFXP[0.png rename to sprites/RFXP[0.png diff --git a/sprites/dlc/RFXP^0.png b/sprites/RFXP^0.png similarity index 100% rename from sprites/dlc/RFXP^0.png rename to sprites/RFXP^0.png diff --git a/sprites/dlc/XEX5A0.png b/sprites/XEX5A0.png similarity index 100% rename from sprites/dlc/XEX5A0.png rename to sprites/XEX5A0.png diff --git a/sprites/dlc/XEX5B0.png b/sprites/XEX5B0.png similarity index 100% rename from sprites/dlc/XEX5B0.png rename to sprites/XEX5B0.png diff --git a/sprites/dlc/XEX5C0.png b/sprites/XEX5C0.png similarity index 100% rename from sprites/dlc/XEX5C0.png rename to sprites/XEX5C0.png diff --git a/sprites/dlc/XEX5D0.png b/sprites/XEX5D0.png similarity index 100% rename from sprites/dlc/XEX5D0.png rename to sprites/XEX5D0.png diff --git a/sprites/dlc/XEX5E0.png b/sprites/XEX5E0.png similarity index 100% rename from sprites/dlc/XEX5E0.png rename to sprites/XEX5E0.png diff --git a/sprites/dlc/XEX5F0.png b/sprites/XEX5F0.png similarity index 100% rename from sprites/dlc/XEX5F0.png rename to sprites/XEX5F0.png diff --git a/sprites/dlc/XEX5G0.png b/sprites/XEX5G0.png similarity index 100% rename from sprites/dlc/XEX5G0.png rename to sprites/XEX5G0.png diff --git a/sprites/dlc/XEX5H0.png b/sprites/XEX5H0.png similarity index 100% rename from sprites/dlc/XEX5H0.png rename to sprites/XEX5H0.png diff --git a/sprites/dlc/XEX5I0.png b/sprites/XEX5I0.png similarity index 100% rename from sprites/dlc/XEX5I0.png rename to sprites/XEX5I0.png diff --git a/sprites/dlc/XEX5J0.png b/sprites/XEX5J0.png similarity index 100% rename from sprites/dlc/XEX5J0.png rename to sprites/XEX5J0.png diff --git a/sprites/dlc/XEX5K0.png b/sprites/XEX5K0.png similarity index 100% rename from sprites/dlc/XEX5K0.png rename to sprites/XEX5K0.png diff --git a/sprites/dlc/XEX5L0.png b/sprites/XEX5L0.png similarity index 100% rename from sprites/dlc/XEX5L0.png rename to sprites/XEX5L0.png diff --git a/sprites/dlc/XEX5M0.png b/sprites/XEX5M0.png similarity index 100% rename from sprites/dlc/XEX5M0.png rename to sprites/XEX5M0.png diff --git a/sprites/dlc/XEX5N0.png b/sprites/XEX5N0.png similarity index 100% rename from sprites/dlc/XEX5N0.png rename to sprites/XEX5N0.png diff --git a/sprites/dlc/XEX5O0.png b/sprites/XEX5O0.png similarity index 100% rename from sprites/dlc/XEX5O0.png rename to sprites/XEX5O0.png diff --git a/sprites/dlc/XEX5P0.png b/sprites/XEX5P0.png similarity index 100% rename from sprites/dlc/XEX5P0.png rename to sprites/XEX5P0.png diff --git a/sprites/dlc/XEX5Q0.png b/sprites/XEX5Q0.png similarity index 100% rename from sprites/dlc/XEX5Q0.png rename to sprites/XEX5Q0.png diff --git a/sprites/dlc/XEX5R0.png b/sprites/XEX5R0.png similarity index 100% rename from sprites/dlc/XEX5R0.png rename to sprites/XEX5R0.png diff --git a/sprites/dlc/XEX5S0.png b/sprites/XEX5S0.png similarity index 100% rename from sprites/dlc/XEX5S0.png rename to sprites/XEX5S0.png diff --git a/sprites/dlc/XEX6A0.png b/sprites/XEX6A0.png similarity index 100% rename from sprites/dlc/XEX6A0.png rename to sprites/XEX6A0.png diff --git a/sprites/dlc/XEX6B0.png b/sprites/XEX6B0.png similarity index 100% rename from sprites/dlc/XEX6B0.png rename to sprites/XEX6B0.png diff --git a/sprites/dlc/XEX6C0.png b/sprites/XEX6C0.png similarity index 100% rename from sprites/dlc/XEX6C0.png rename to sprites/XEX6C0.png diff --git a/sprites/dlc/XEX6D0.png b/sprites/XEX6D0.png similarity index 100% rename from sprites/dlc/XEX6D0.png rename to sprites/XEX6D0.png diff --git a/sprites/dlc/XEX6E0.png b/sprites/XEX6E0.png similarity index 100% rename from sprites/dlc/XEX6E0.png rename to sprites/XEX6E0.png diff --git a/sprites/dlc/XEX6F0.png b/sprites/XEX6F0.png similarity index 100% rename from sprites/dlc/XEX6F0.png rename to sprites/XEX6F0.png diff --git a/sprites/dlc/XEX6G0.png b/sprites/XEX6G0.png similarity index 100% rename from sprites/dlc/XEX6G0.png rename to sprites/XEX6G0.png diff --git a/sprites/dlc/XEX6H0.png b/sprites/XEX6H0.png similarity index 100% rename from sprites/dlc/XEX6H0.png rename to sprites/XEX6H0.png diff --git a/sprites/dlc/XEX6I0.png b/sprites/XEX6I0.png similarity index 100% rename from sprites/dlc/XEX6I0.png rename to sprites/XEX6I0.png diff --git a/sprites/dlc/XEX6J0.png b/sprites/XEX6J0.png similarity index 100% rename from sprites/dlc/XEX6J0.png rename to sprites/XEX6J0.png diff --git a/sprites/dlc/XEX6K0.png b/sprites/XEX6K0.png similarity index 100% rename from sprites/dlc/XEX6K0.png rename to sprites/XEX6K0.png diff --git a/sprites/dlc/XEX6L0.png b/sprites/XEX6L0.png similarity index 100% rename from sprites/dlc/XEX6L0.png rename to sprites/XEX6L0.png diff --git a/sprites/dlc/XEX6M0.png b/sprites/XEX6M0.png similarity index 100% rename from sprites/dlc/XEX6M0.png rename to sprites/XEX6M0.png diff --git a/sprites/dlc/XEX6N0.png b/sprites/XEX6N0.png similarity index 100% rename from sprites/dlc/XEX6N0.png rename to sprites/XEX6N0.png diff --git a/sprites/dlc/XEX6O0.png b/sprites/XEX6O0.png similarity index 100% rename from sprites/dlc/XEX6O0.png rename to sprites/XEX6O0.png diff --git a/sprites/dlc/XEX6P0.png b/sprites/XEX6P0.png similarity index 100% rename from sprites/dlc/XEX6P0.png rename to sprites/XEX6P0.png diff --git a/sprites/dlc/XEX6Q0.png b/sprites/XEX6Q0.png similarity index 100% rename from sprites/dlc/XEX6Q0.png rename to sprites/XEX6Q0.png diff --git a/sprites/dlc/XEX6R0.png b/sprites/XEX6R0.png similarity index 100% rename from sprites/dlc/XEX6R0.png rename to sprites/XEX6R0.png diff --git a/sprites/dlc/XEX6S0.png b/sprites/XEX6S0.png similarity index 100% rename from sprites/dlc/XEX6S0.png rename to sprites/XEX6S0.png diff --git a/sprites/dlc/XRG6A0.png b/sprites/XRG6A0.png similarity index 100% rename from sprites/dlc/XRG6A0.png rename to sprites/XRG6A0.png diff --git a/sprites/dlc/XRG6B0.png b/sprites/XRG6B0.png similarity index 100% rename from sprites/dlc/XRG6B0.png rename to sprites/XRG6B0.png diff --git a/sprites/dlc/XRG6C0.png b/sprites/XRG6C0.png similarity index 100% rename from sprites/dlc/XRG6C0.png rename to sprites/XRG6C0.png diff --git a/sprites/dlc/XRG6D0.png b/sprites/XRG6D0.png similarity index 100% rename from sprites/dlc/XRG6D0.png rename to sprites/XRG6D0.png diff --git a/sprites/dlc/XRG6E0.png b/sprites/XRG6E0.png similarity index 100% rename from sprites/dlc/XRG6E0.png rename to sprites/XRG6E0.png diff --git a/sprites/dlc/XRG6F0.png b/sprites/XRG6F0.png similarity index 100% rename from sprites/dlc/XRG6F0.png rename to sprites/XRG6F0.png diff --git a/sprites/dlc/XRG6G0.png b/sprites/XRG6G0.png similarity index 100% rename from sprites/dlc/XRG6G0.png rename to sprites/XRG6G0.png diff --git a/sprites/dlc/XRG6H0.png b/sprites/XRG6H0.png similarity index 100% rename from sprites/dlc/XRG6H0.png rename to sprites/XRG6H0.png diff --git a/sprites/dlc/XRG6I0.png b/sprites/XRG6I0.png similarity index 100% rename from sprites/dlc/XRG6I0.png rename to sprites/XRG6I0.png diff --git a/sprites/dlc/XRG6J0.png b/sprites/XRG6J0.png similarity index 100% rename from sprites/dlc/XRG6J0.png rename to sprites/XRG6J0.png diff --git a/sprites/dlc/XRG6K0.png b/sprites/XRG6K0.png similarity index 100% rename from sprites/dlc/XRG6K0.png rename to sprites/XRG6K0.png diff --git a/sprites/dlc/XRG6L0.png b/sprites/XRG6L0.png similarity index 100% rename from sprites/dlc/XRG6L0.png rename to sprites/XRG6L0.png diff --git a/sprites/dlc/XRG6M0.png b/sprites/XRG6M0.png similarity index 100% rename from sprites/dlc/XRG6M0.png rename to sprites/XRG6M0.png diff --git a/sprites/dlc/XRG6N0.png b/sprites/XRG6N0.png similarity index 100% rename from sprites/dlc/XRG6N0.png rename to sprites/XRG6N0.png diff --git a/sprites/dlc/XRG6O0.png b/sprites/XRG6O0.png similarity index 100% rename from sprites/dlc/XRG6O0.png rename to sprites/XRG6O0.png diff --git a/sprites/dlc/XRG6P0.png b/sprites/XRG6P0.png similarity index 100% rename from sprites/dlc/XRG6P0.png rename to sprites/XRG6P0.png diff --git a/sprites/dlc/XRG6Q0.png b/sprites/XRG6Q0.png similarity index 100% rename from sprites/dlc/XRG6Q0.png rename to sprites/XRG6Q0.png diff --git a/sprites/dlc/XRG6R0.png b/sprites/XRG6R0.png similarity index 100% rename from sprites/dlc/XRG6R0.png rename to sprites/XRG6R0.png diff --git a/sprites/dlc/XRG6S0.png b/sprites/XRG6S0.png similarity index 100% rename from sprites/dlc/XRG6S0.png rename to sprites/XRG6S0.png diff --git a/sprites/dlc/XRG6T0.png b/sprites/XRG6T0.png similarity index 100% rename from sprites/dlc/XRG6T0.png rename to sprites/XRG6T0.png diff --git a/sprites/dlc/XRG6U0.png b/sprites/XRG6U0.png similarity index 100% rename from sprites/dlc/XRG6U0.png rename to sprites/XRG6U0.png diff --git a/sprites/dlc/XRG6V0.png b/sprites/XRG6V0.png similarity index 100% rename from sprites/dlc/XRG6V0.png rename to sprites/XRG6V0.png diff --git a/sprites/dlc/XRG6W0.png b/sprites/XRG6W0.png similarity index 100% rename from sprites/dlc/XRG6W0.png rename to sprites/XRG6W0.png diff --git a/sprites/dlc/XRG6X0.png b/sprites/XRG6X0.png similarity index 100% rename from sprites/dlc/XRG6X0.png rename to sprites/XRG6X0.png diff --git a/sprites/dlc/XRG7A0.png b/sprites/XRG7A0.png similarity index 100% rename from sprites/dlc/XRG7A0.png rename to sprites/XRG7A0.png diff --git a/sprites/dlc/XRG7B0.png b/sprites/XRG7B0.png similarity index 100% rename from sprites/dlc/XRG7B0.png rename to sprites/XRG7B0.png diff --git a/sprites/dlc/XRG7C0.png b/sprites/XRG7C0.png similarity index 100% rename from sprites/dlc/XRG7C0.png rename to sprites/XRG7C0.png diff --git a/sprites/dlc/XRG7D0.png b/sprites/XRG7D0.png similarity index 100% rename from sprites/dlc/XRG7D0.png rename to sprites/XRG7D0.png diff --git a/sprites/dlc/XRG7E0.png b/sprites/XRG7E0.png similarity index 100% rename from sprites/dlc/XRG7E0.png rename to sprites/XRG7E0.png diff --git a/sprites/dlc/XRG7F0.png b/sprites/XRG7F0.png similarity index 100% rename from sprites/dlc/XRG7F0.png rename to sprites/XRG7F0.png diff --git a/sprites/dlc/XRG7G0.png b/sprites/XRG7G0.png similarity index 100% rename from sprites/dlc/XRG7G0.png rename to sprites/XRG7G0.png diff --git a/sprites/dlc/XRG7H0.png b/sprites/XRG7H0.png similarity index 100% rename from sprites/dlc/XRG7H0.png rename to sprites/XRG7H0.png diff --git a/sprites/dlc/XRG7I0.png b/sprites/XRG7I0.png similarity index 100% rename from sprites/dlc/XRG7I0.png rename to sprites/XRG7I0.png diff --git a/sprites/dlc/XRG7J0.png b/sprites/XRG7J0.png similarity index 100% rename from sprites/dlc/XRG7J0.png rename to sprites/XRG7J0.png diff --git a/sprites/dlc/XRG7K0.png b/sprites/XRG7K0.png similarity index 100% rename from sprites/dlc/XRG7K0.png rename to sprites/XRG7K0.png diff --git a/sprites/dlc/XRG7L0.png b/sprites/XRG7L0.png similarity index 100% rename from sprites/dlc/XRG7L0.png rename to sprites/XRG7L0.png diff --git a/sprites/dlc/XRG7M0.png b/sprites/XRG7M0.png similarity index 100% rename from sprites/dlc/XRG7M0.png rename to sprites/XRG7M0.png diff --git a/sprites/dlc/XRG7N0.png b/sprites/XRG7N0.png similarity index 100% rename from sprites/dlc/XRG7N0.png rename to sprites/XRG7N0.png diff --git a/sprites/dlc/XRG7O0.png b/sprites/XRG7O0.png similarity index 100% rename from sprites/dlc/XRG7O0.png rename to sprites/XRG7O0.png diff --git a/sprites/dlc/XRG7P0.png b/sprites/XRG7P0.png similarity index 100% rename from sprites/dlc/XRG7P0.png rename to sprites/XRG7P0.png diff --git a/sprites/dlc/XRG7Q0.png b/sprites/XRG7Q0.png similarity index 100% rename from sprites/dlc/XRG7Q0.png rename to sprites/XRG7Q0.png diff --git a/sprites/dlc/XRG7R0.png b/sprites/XRG7R0.png similarity index 100% rename from sprites/dlc/XRG7R0.png rename to sprites/XRG7R0.png diff --git a/sprites/dlc/XRG7S0.png b/sprites/XRG7S0.png similarity index 100% rename from sprites/dlc/XRG7S0.png rename to sprites/XRG7S0.png diff --git a/sprites/dlc/XRG7T0.png b/sprites/XRG7T0.png similarity index 100% rename from sprites/dlc/XRG7T0.png rename to sprites/XRG7T0.png diff --git a/sprites/dlc/XRG7U0.png b/sprites/XRG7U0.png similarity index 100% rename from sprites/dlc/XRG7U0.png rename to sprites/XRG7U0.png diff --git a/sprites/dlc/XRG7V0.png b/sprites/XRG7V0.png similarity index 100% rename from sprites/dlc/XRG7V0.png rename to sprites/XRG7V0.png diff --git a/sprites/dlc/XRG7W0.png b/sprites/XRG7W0.png similarity index 100% rename from sprites/dlc/XRG7W0.png rename to sprites/XRG7W0.png diff --git a/sprites/dlc/XRG7X0.png b/sprites/XRG7X0.png similarity index 100% rename from sprites/dlc/XRG7X0.png rename to sprites/XRG7X0.png diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index 548ebf79c..5b3ae86aa 100644 --- a/zscript/dlc1/swwm_hammertime.zsc +++ b/zscript/dlc1/swwm_hammertime.zsc @@ -30,6 +30,21 @@ Class ItamexHammer : SWWMWeapon A_QuakeEx(1,1,1,15,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.1); return ResolveState(null); } + action void A_HammerAltHit() + { + Vector3 x, y, z; + [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); + SWWMUtility.DoKnockback(self,x,3000.*invoker.charge); + if ( A_Melee(int(100+invoker.charge*2),"itamex/hit",1.8,1.1,3.,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) ) + { + A_BumpFOV(.9); + A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35); + A_AlertMonsters(swwm_uncapalert?0:800); + return; + } + A_BumpFOV(.95); + A_QuakeEx(1,1,1,15,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.1); + } override void DoEffect() { @@ -113,15 +128,66 @@ Class ItamexHammer : SWWMWeapon if ( invoker.charge <= 0 ) A_StopSound(CHAN_WEAPONEXTRA); } + action void A_AltCharge() + { + invoker.charge = min(100.,invoker.charge*1.02+1.); + double vibe = (invoker.charge/100.)**2.; + A_WeaponOffset(FRandom[Hammer](-.5,.5)*vibe,32+FRandom[Hammer](-.5,.5)*vibe,WOF_INTERPOLATE); + } + + action State A_AltHold() + { + invoker.charge = min(100.,invoker.charge*1.02+1.); + double vibe = (invoker.charge/100.)**2.; + A_WeaponOffset(FRandom[Hammer](-.5,.5)*vibe,32+FRandom[Hammer](-.5,.5)*vibe,WOF_INTERPOLATE); + if ( !(player.cmd.buttons&BT_ALTATTACK) ) + { + A_WeaponOffset(0,32,WOF_INTERPOLATE); + return ResolveState("AltRelease"); + } + return ResolveState(null); + } + + action void A_AltRelease() + { + Vector3 x, y, z; + [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); + SWWMUtility.DoKnockback(self,x-(0,0,3.),120000.); + A_BumpFOV(.9); + A_StartSound("itamex/drop",CHAN_WEAPONEXTRA2); + A_StartSound("itamex/drop",CHAN_WEAPONEXTRA3); + } + + action void A_AltHit() + { + if ( (pos.z <= floorz+16) && (pitch > -15) ) + { + A_StopSound(CHAN_WEAPONEXTRA2); + A_StopSound(CHAN_WEAPONEXTRA3); + A_StartSound("itamex/slam",CHAN_WEAPON,CHANF_OVERLAP); + A_StartSound("itamex/slam",CHAN_WEAPON,CHANF_OVERLAP); + vel.z += invoker.charge*.03; + A_BumpFOV(.85); + A_QuakeEx(8,8,8,10,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); + A_AlertMonsters(swwm_uncapalert?0:2500); + let s = Spawn("HammerShockwave",(pos.x,pos.y,floorz)); + s.target = self; + s.special1 = int(invoker.charge*3); + } + invoker.charge = 0.; + } + override void OwnerDied() { Super.OwnerDied(); A_StopSound(CHAN_WEAPONEXTRA); + charge = 0.; } override void Travelled() { Super.Travelled(); A_StopSound(CHAN_WEAPONEXTRA); + charge = 0.; } Default @@ -152,7 +218,11 @@ Class ItamexHammer : SWWMWeapon XZW2 PQRST 3; Goto Ready; Ready: - XZW2 A 1 A_WeaponReady(WRF_ALLOWRELOAD|WRF_ALLOWZOOM|WRF_ALLOWUSER1); + XZW2 A 1 + { + A_WeaponOffset(0,32,WOF_INTERPOLATE); // ensure we're back to normal offsets just in case + A_WeaponReady(WRF_ALLOWRELOAD|WRF_ALLOWZOOM|WRF_ALLOWUSER1); + } Wait; Fire: XZW2 A 2 A_StartSound("itamex/meleestart",CHAN_WEAPON,CHANF_OVERLAP); @@ -169,15 +239,34 @@ Class ItamexHammer : SWWMWeapon XZW3 MNOPQR 2; Goto Ready; FireHit: - XZW3 FF 2; - XZW3 STU 2; - XZW3 VWXYZ 1; + XZW3 F 2; + XZW3 STUVW 2; + XZW3 XYZ 1; XZW4 A 2; XZW4 B 2 A_StartSound("itamex/meleeend",CHAN_WEAPON,CHANF_OVERLAP,starttime:.42); XZW4 C 2; Goto Ready; AltFire: - XZW2 A 1; // TODO + XZW2 A 2 A_StartSound("itamex/meleestart",CHAN_WEAPON,CHANF_OVERLAP); + XZW4 DEFG 2 A_AltCharge(); + XZW4 HIJKLMNOPQRSTU 1 A_AltCharge(); + XZW4 V 1 A_AltHold(); + Wait; + AltRelease: + XZW4 V 1 A_AltRelease(); + XZW4 WXYZ 1 A_BumpPitch(2.); + XZW5 A 1 A_BumpPitch(3.); + XZW5 B 1 + { + A_BumpPitch(3.); + A_HammerAltHit(); + } + XZW5 CD 1 A_BumpPitch(4.); + XZW5 E 1 A_AltHit(); + XZW5 FGHIJKLMN 2; + XZW5 O 2 A_StartSound("itamex/meleeend",CHAN_WEAPON,CHANF_OVERLAP); + XZW5 PQRS 2; + XZW5 TUVW 3; Goto Ready; Zoom: XZW2 A 2 A_StartSound("itamex/meleestart",CHAN_WEAPON,CHANF_OVERLAP); diff --git a/zscript/dlc1/swwm_hammertime_fx.zsc b/zscript/dlc1/swwm_hammertime_fx.zsc index 5727340da..5a07f7785 100644 --- a/zscript/dlc1/swwm_hammertime_fx.zsc +++ b/zscript/dlc1/swwm_hammertime_fx.zsc @@ -1 +1,100 @@ // Itamex Hammer projectiles and effects + +// akin to the land shockwave, but with sliiiiightly different behavior +Class HammerShockwave : Actor +{ + Default + { + Obituary "$O_HAMMER"; + +NOGRAVITY; + +NOBLOCKMAP; + +NOTELEPORT; + +NODAMAGETHRUST; + +FORCERADIUSDMG; + +NOINTERACTION; + Radius .1; + Height 0.; + } + override void PostBeginPlay() + { + Super.PostBeginPlay(); + A_QuakeEx(5,5,5,20,0,300+special1*4,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:.8); + SWWMUtility.DoExplosion(self,30+special1/2,100000+special1*2000,80+special1/2,40,DE_BLAST|DE_EXTRAZTHRUST,'HammerShockwave',target); + for ( int i=0; i<360; i+=5 ) + { + Vector3 pvel = (FRandom[ExploS](-1,1),FRandom[ExploS](-1,1),FRandom[ExploS](-1,1)).unit()*FRandom[ExploS](1,3); + let s = Spawn("SWWMSmoke",Vec3Angle(4,i,8)); + s.vel = pvel+(cos(i),sin(i),0)*7.; + s.SetShade(Color(1,1,1)*Random[ExploS](64,224)); + s.special1 = Random[ExploS](1,4); + s.scale *= 1.5; + s.alpha *= .4; + } + for ( int i=0; i<360; i+=5 ) + { + let r = Spawn("HammerRadiusShockwave",Vec3Angle(5,i)); + r.target = target; + r.angle = i; + r.vel.xy = (cos(i),sin(i))*(r.speed+special1*.1); + r.alpha *= .3+special1*.0005; + } + int numpt = Random[ExploS](10,20); + for ( int i=0; i 0 ) tics--; + while ( !tics ) + { + if ( !SetState(CurState.NextState) ) + return; + } + } + States + { + Spawn: + TNT1 A 140; + Stop; + } +} + +Class HammerRadiusShockwave : DemolitionistRadiusShockwave +{ + Default + { + Obituary "$O_HAMMER"; + DamageType 'HammerShockwave'; + DamageFunction int(100*alpha); + } +} diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index c1cf19374..a970d172d 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -1137,7 +1137,7 @@ Class RagekitPower : Powerup override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive, Actor inflictor, Actor source, int flags ) { if ( passive ) return; - if ( (damageType == 'Melee') || (damageType == 'Jump') || (damageType == 'Dash') || (damageType == 'Buttslam') || (damageType == 'GroundPound') ) + if ( (damageType == 'Melee') || (damageType == 'Jump') || (damageType == 'Dash') || (damageType == 'Buttslam') || (damageType == 'GroundPound') || (damageType == 'HammerShockwave') ) { newdamage = damage*8; DoHitFX(); diff --git a/zscript/swwm_thinkers_player.zsc b/zscript/swwm_thinkers_player.zsc index 1944e5803..93a42b5fb 100644 --- a/zscript/swwm_thinkers_player.zsc +++ b/zscript/swwm_thinkers_player.zsc @@ -166,6 +166,7 @@ Class SWWMStats : SWWMStaticThinker if ( inflictor && inflictor.FindInventory("ParriedBuff") ) which = 'DoomWeapon'; // gross hack // properly credit some projectiles to their respective gun else if ( inflictor is 'AirBullet' ) which = 'DeepImpact'; + else if ( (inflictor is 'HammerShockwave') || (inflictor is 'HammerRadiusShockwave') ) which = 'ItamexHammer'; else if ( (inflictor is 'ExplodiumMagArm') || (inflictor is 'ExplodiumMagProj') || (inflictor is 'ExplodiumBulletImpact') ) which = 'ExplodiumGun'; else if ( ((inflictor is 'SaltImpact') && !inflictor.Args[0]) || ((inflictor is 'SaltBeam') && !inflictor.Args[1]) || (inflictor is 'CorrodeDebuff') || (inflictor is 'CorrosiveFlechette') || ((inflictor is 'TheBall') && !inflictor.special1) || (inflictor is 'GoldenImpact') || (inflictor is 'GoldenSubImpact') || (inflictor is 'GoldenSubSubImpact') ) which = 'Spreadgun'; else if ( ((inflictor is 'SaltImpact') && inflictor.Args[0]) || ((inflictor is 'SaltBeam') && inflictor.Args[1]) || ((inflictor is 'TheBall') && inflictor.special1) ) which = 'Wallbuster'; diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index b038b7465..313adc4d5 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -1145,6 +1145,7 @@ Class SWWMUtility static bool IsExplosiveSource( Actor s ) { if ( s is 'DemolitionistShockwave' ) return false; + if ( s is 'HammerShockwave' ) return false; if ( s is 'BigPunchSplash' ) return false; if ( s is 'AirBullet' ) return false; if ( s is 'SaltBeam' ) return false; diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index ca5629a2a..e519a237d 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -183,6 +183,13 @@ Class SWWMWeapon : Weapon abstract Demolitionist(self).lastbump *= factor; } + action void A_BumpPitch( double factor ) + { + if ( !(self is 'Demolitionist') ) return; + Demolitionist(self).bumppitch.Push(factor); + A_SetPitch(pitch+factor,SPF_INTERPOLATE); + } + // subtracts given ammo from price, drops excess virtual bool PickupForAmmoSWWM( SWWMWeapon ownedWeapon ) { diff --git a/zscript/weapons/swwm_baseweapon_melee.zsc b/zscript/weapons/swwm_baseweapon_melee.zsc index 72c2e98e0..fde419969 100644 --- a/zscript/weapons/swwm_baseweapon_melee.zsc +++ b/zscript/weapons/swwm_baseweapon_melee.zsc @@ -529,14 +529,14 @@ extend Class SWWMWeapon invoker.wallponch = false; // check for shootables SWWMBulletTrail.DoTrail(self,origin,dir,DEFMELEERANGE*rangemul,0); - if ( TryMelee((raging?.3:.2)*spreadmul,dmg,hitsound,rangemul,kickmul,flags) ) - return true; + bool res = TryMelee((raging?.3:.2)*spreadmul,dmg,hitsound,rangemul,kickmul,flags); + if ( !flags&MELEE_Rip ) return res; // check for walls instead FTranslatedLineTarget t; double slope = AimLineAttack(angle,DEFMELEERANGE*rangemul,t,0.,ALF_CHECK3D); FLineTraceData d; LineTrace(angle,DEFMELEERANGE*rangemul,slope,TRF_THRUACTORS,player.viewheight,data:d); - if ( d.HitType == TRACE_HitNone ) return false; + if ( d.HitType == TRACE_HitNone ) return res; Vector3 HitNormal = -d.HitDir; if ( d.HitType == TRACE_HitFloor ) { @@ -570,7 +570,11 @@ extend Class SWWMWeapon A_StartSound((raging&&!(flags&MELEE_ForceSound))?"demolitionist/xpunch":(hitsound!="")?hitsound:"demolitionist/punch",CHAN_WEAPON,CHANF_OVERLAP); A_AlertMonsters(swwm_uncapalert?0:100); if ( raging ) raging.DoHitFX(); - if ( (flags&MELEE_ForceBust) || swwm_omnibust ) BusterWall.BustLinetrace(d,raging?(dmg*8):dmg,self,d.HitDir,d.HitLocation.z); + if ( (flags&MELEE_ForceBust) || swwm_omnibust ) + { + if ( flags&MELEE_HammerHit ) dmg = dmg*2+200; // extra bust damage if it's the hammer + BusterWall.BustLinetrace(d,raging?(dmg*8):dmg,self,d.HitDir,d.HitLocation.z); + } return true; } }