diff --git a/language.version b/language.version index b77f0f2e4..ab3f3f401 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r712 \cu(Wed 28 Dec 21:31:00 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r712 \cu(2022-12-28 21:31:00)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r713 \cu(Wed 28 Dec 22:18:03 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r713 \cu(2022-12-28 22:18:03)\c-"; diff --git a/sprites/SPKPA0.png b/sprites/BSPPA0.png similarity index 100% rename from sprites/SPKPA0.png rename to sprites/BSPPA0.png diff --git a/sprites/DUSTA0.png b/sprites/DUSTA0.png deleted file mode 100644 index 4ee2f54e7..000000000 Binary files a/sprites/DUSTA0.png and /dev/null differ diff --git a/sprites/DUSTB0.png b/sprites/DUSTB0.png deleted file mode 100644 index f8a4d414e..000000000 Binary files a/sprites/DUSTB0.png and /dev/null differ diff --git a/sprites/DUSTC0.png b/sprites/DUSTC0.png deleted file mode 100644 index 3b86b189b..000000000 Binary files a/sprites/DUSTC0.png and /dev/null differ diff --git a/sprites/DUSTD0.png b/sprites/DUSTD0.png deleted file mode 100644 index ac8387f48..000000000 Binary files a/sprites/DUSTD0.png and /dev/null differ diff --git a/sprites/DUSTE0.png b/sprites/DUSTE0.png deleted file mode 100644 index 08ba1c01f..000000000 Binary files a/sprites/DUSTE0.png and /dev/null differ diff --git a/sprites/DUSTF0.png b/sprites/DUSTF0.png deleted file mode 100644 index 1d3150b01..000000000 Binary files a/sprites/DUSTF0.png and /dev/null differ diff --git a/sprites/DUSTG0.png b/sprites/DUSTG0.png deleted file mode 100644 index 134121163..000000000 Binary files a/sprites/DUSTG0.png and /dev/null differ diff --git a/sprites/DUSTH0.png b/sprites/DUSTH0.png deleted file mode 100644 index 2bdf67d47..000000000 Binary files a/sprites/DUSTH0.png and /dev/null differ diff --git a/sprites/DUSTI0.png b/sprites/DUSTI0.png deleted file mode 100644 index 09be9de15..000000000 Binary files a/sprites/DUSTI0.png and /dev/null differ diff --git a/sprites/DUSTJ0.png b/sprites/DUSTJ0.png deleted file mode 100644 index c37a9a62c..000000000 Binary files a/sprites/DUSTJ0.png and /dev/null differ diff --git a/sprites/DUSTK0.png b/sprites/DUSTK0.png deleted file mode 100644 index e52377598..000000000 Binary files a/sprites/DUSTK0.png and /dev/null differ diff --git a/sprites/DUSTL0.png b/sprites/DUSTL0.png deleted file mode 100644 index 7b403fa17..000000000 Binary files a/sprites/DUSTL0.png and /dev/null differ diff --git a/sprites/DUSTM0.png b/sprites/DUSTM0.png deleted file mode 100644 index d216cfa99..000000000 Binary files a/sprites/DUSTM0.png and /dev/null differ diff --git a/sprites/DUSTN0.png b/sprites/DUSTN0.png deleted file mode 100644 index dc1308094..000000000 Binary files a/sprites/DUSTN0.png and /dev/null differ diff --git a/sprites/DUSTO0.png b/sprites/DUSTO0.png deleted file mode 100644 index 057cc4047..000000000 Binary files a/sprites/DUSTO0.png and /dev/null differ diff --git a/sprites/DUSTP0.png b/sprites/DUSTP0.png deleted file mode 100644 index 918b3885f..000000000 Binary files a/sprites/DUSTP0.png and /dev/null differ diff --git a/sprites/DUSTQ0.png b/sprites/DUSTQ0.png deleted file mode 100644 index bd151eb79..000000000 Binary files a/sprites/DUSTQ0.png and /dev/null differ diff --git a/sprites/DUSTR0.png b/sprites/DUSTR0.png deleted file mode 100644 index 63cef58f4..000000000 Binary files a/sprites/DUSTR0.png and /dev/null differ diff --git a/sprites/DUSTS0.png b/sprites/DUSTS0.png deleted file mode 100644 index 39eaedd60..000000000 Binary files a/sprites/DUSTS0.png and /dev/null differ diff --git a/sprites/DUSTT0.png b/sprites/DUSTT0.png deleted file mode 100644 index 014dcb1b3..000000000 Binary files a/sprites/DUSTT0.png and /dev/null differ diff --git a/sprites/MEATA0.png b/sprites/FGIBA0.png similarity index 100% rename from sprites/MEATA0.png rename to sprites/FGIBA0.png diff --git a/sprites/MEATB0.png b/sprites/FGIBB0.png similarity index 100% rename from sprites/MEATB0.png rename to sprites/FGIBB0.png diff --git a/sprites/MEATC0.png b/sprites/FGIBC0.png similarity index 100% rename from sprites/MEATC0.png rename to sprites/FGIBC0.png diff --git a/sprites/MEATD0.png b/sprites/FGIBD0.png similarity index 100% rename from sprites/MEATD0.png rename to sprites/FGIBD0.png diff --git a/sprites/MEATE0.png b/sprites/FGIBE0.png similarity index 100% rename from sprites/MEATE0.png rename to sprites/FGIBE0.png diff --git a/sprites/MEATF0.png b/sprites/FGIBF0.png similarity index 100% rename from sprites/MEATF0.png rename to sprites/FGIBF0.png diff --git a/sprites/JUNKA0.png b/sprites/JUNKA0.png deleted file mode 100644 index 459ee09d5..000000000 Binary files a/sprites/JUNKA0.png and /dev/null differ diff --git a/sprites/JUNKB0.png b/sprites/JUNKB0.png deleted file mode 100644 index cd167ecdc..000000000 Binary files a/sprites/JUNKB0.png and /dev/null differ diff --git a/sprites/JUNKC0.png b/sprites/JUNKC0.png deleted file mode 100644 index 4e47b192d..000000000 Binary files a/sprites/JUNKC0.png and /dev/null differ diff --git a/sprites/JUNKD0.png b/sprites/JUNKD0.png deleted file mode 100644 index 3f7af9410..000000000 Binary files a/sprites/JUNKD0.png and /dev/null differ diff --git a/sprites/JUNKE0.png b/sprites/JUNKE0.png deleted file mode 100644 index 4144aeb31..000000000 Binary files a/sprites/JUNKE0.png and /dev/null differ diff --git a/sprites/JUNKF0.png b/sprites/JUNKF0.png deleted file mode 100644 index 1f7c884f2..000000000 Binary files a/sprites/JUNKF0.png and /dev/null differ diff --git a/sprites/XFLMA0.png b/sprites/XFIRA0.png similarity index 100% rename from sprites/XFLMA0.png rename to sprites/XFIRA0.png diff --git a/sprites/XFLMB0.png b/sprites/XFIRB0.png similarity index 100% rename from sprites/XFLMB0.png rename to sprites/XFIRB0.png diff --git a/sprites/XFLMC0.png b/sprites/XFIRC0.png similarity index 100% rename from sprites/XFLMC0.png rename to sprites/XFIRC0.png diff --git a/sprites/XFLMD0.png b/sprites/XFIRD0.png similarity index 100% rename from sprites/XFLMD0.png rename to sprites/XFIRD0.png diff --git a/sprites/XFLME0.png b/sprites/XFIRE0.png similarity index 100% rename from sprites/XFLME0.png rename to sprites/XFIRE0.png diff --git a/sprites/XFLMF0.png b/sprites/XFIRF0.png similarity index 100% rename from sprites/XFLMF0.png rename to sprites/XFIRF0.png diff --git a/sprites/XFLMG0.png b/sprites/XFIRG0.png similarity index 100% rename from sprites/XFLMG0.png rename to sprites/XFIRG0.png diff --git a/sprites/XFLMH0.png b/sprites/XFIRH0.png similarity index 100% rename from sprites/XFLMH0.png rename to sprites/XFIRH0.png diff --git a/sprites/XFLMI0.png b/sprites/XFIRI0.png similarity index 100% rename from sprites/XFLMI0.png rename to sprites/XFIRI0.png diff --git a/sprites/XFLMJ0.png b/sprites/XFIRJ0.png similarity index 100% rename from sprites/XFLMJ0.png rename to sprites/XFIRJ0.png diff --git a/sprites/XFLMK0.png b/sprites/XFIRK0.png similarity index 100% rename from sprites/XFLMK0.png rename to sprites/XFIRK0.png diff --git a/sprites/XFLML0.png b/sprites/XFIRL0.png similarity index 100% rename from sprites/XFLML0.png rename to sprites/XFIRL0.png diff --git a/sprites/XFLMM0.png b/sprites/XFIRM0.png similarity index 100% rename from sprites/XFLMM0.png rename to sprites/XFIRM0.png diff --git a/sprites/XFLMN0.png b/sprites/XFIRN0.png similarity index 100% rename from sprites/XFLMN0.png rename to sprites/XFIRN0.png diff --git a/sprites/XFLMO0.png b/sprites/XFIRO0.png similarity index 100% rename from sprites/XFLMO0.png rename to sprites/XFIRO0.png diff --git a/sprites/XFLMP0.png b/sprites/XFIRP0.png similarity index 100% rename from sprites/XFLMP0.png rename to sprites/XFIRP0.png diff --git a/sprites/XFLMQ0.png b/sprites/XFIRQ0.png similarity index 100% rename from sprites/XFLMQ0.png rename to sprites/XFIRQ0.png diff --git a/sprites/XFLMR0.png b/sprites/XFIRR0.png similarity index 100% rename from sprites/XFLMR0.png rename to sprites/XFIRR0.png diff --git a/sprites/XFLMS0.png b/sprites/XFIRS0.png similarity index 100% rename from sprites/XFLMS0.png rename to sprites/XFIRS0.png diff --git a/sprites/XFLMT0.png b/sprites/XFIRT0.png similarity index 100% rename from sprites/XFLMT0.png rename to sprites/XFIRT0.png diff --git a/zscript/dlc1/swwm_notashotgun_fx.zsc b/zscript/dlc1/swwm_notashotgun_fx.zsc index 1d2acfc93..6cc2332c3 100644 --- a/zscript/dlc1/swwm_notashotgun_fx.zsc +++ b/zscript/dlc1/swwm_notashotgun_fx.zsc @@ -113,7 +113,7 @@ Class QuadTrail : SWWMNonInteractiveActor States { Spawn: - XFLM ABCDEFGHIJKLMNOPQRST 1 Bright A_Flame(); + XFIR ABCDEFGHIJKLMNOPQRST 1 Bright A_Flame(); Loop; } } @@ -1085,7 +1085,7 @@ Class OnFireTrail : SWWMNonInteractiveActor States { Spawn: - XFLM AABBCCDDEEFFGGHHIIJJKKLLMMNNOOPPQQRRSSTT 1 Bright A_Flame(); + XFIR AABBCCDDEEFFGGHHIIJJKKLLMMNNOOPPQQRRSSTT 1 Bright A_Flame(); Loop; } } diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index c0ffc00ec..b61e8f5cb 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -632,10 +632,10 @@ Class mkFlyingGib : Actor States { Spawn: - MEAT # 1; + FGIB # 1; Wait; Bounce: - MEAT # 0 + FGIB # 0 { A_Bleed(); A_StartSound("misc/gibhit",CHAN_BODY,CHANF_OVERLAP); @@ -645,10 +645,10 @@ Class mkFlyingGib : Actor } Goto Spawn; Death: - MEAT # 1 A_JumpIf(pos.z<=floorz,"Death2"); + FGIB # 1 A_JumpIf(pos.z<=floorz,"Death2"); Wait; Death2: - MEAT # -1 + FGIB # -1 { A_StartSound("misc/gibhit",CHAN_BODY,CHANF_OVERLAP); pitch = Random[Gibs](-5,5); diff --git a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc index 630574e82..f4ea909b0 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc @@ -148,7 +148,7 @@ Class GatherDust : SWWMNonInteractiveActor States { Spawn: - DUST ABCDEFGHIJKLMNOPQRST 1 A_Gravitate(); + BSMK ABCDEFGHIJKLMNOPQRST 1 A_Gravitate(); Wait; } } @@ -631,7 +631,7 @@ Class YnykronCloud : SWWMNonInteractiveActor States { Spawn: - DUST ABCDEFGHIJKLMNOPQRST 1 A_Gravitate(); + BSMK ABCDEFGHIJKLMNOPQRST 1 A_Gravitate(); Wait; } } diff --git a/zscript/weapons/swwm_sparkyboi_fx.zsc b/zscript/weapons/swwm_sparkyboi_fx.zsc index c10979356..fc7fb97fb 100644 --- a/zscript/weapons/swwm_sparkyboi_fx.zsc +++ b/zscript/weapons/swwm_sparkyboi_fx.zsc @@ -1509,7 +1509,7 @@ Class BiosparkSpark : SWWMNonInteractiveActor States { Spawn: - SPKP A 1 Bright + BSPP A 1 Bright { A_SetScale(scale.x*specialf1); A_FadeOut(specialf2);