diff --git a/language.version b/language.version index ab3f3f401..a2af6c9f4 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -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-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r714 \cu(Wed 28 Dec 22:20:01 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r714 \cu(2022-12-28 22:20:01)\c-"; diff --git a/sprites/xdeaths/BO2XA0.png b/sprites/xdeaths/BO2XA0.png deleted file mode 100644 index 4aadaa265..000000000 Binary files a/sprites/xdeaths/BO2XA0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XB0.png b/sprites/xdeaths/BO2XB0.png deleted file mode 100644 index 5cf2533bd..000000000 Binary files a/sprites/xdeaths/BO2XB0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XC0.png b/sprites/xdeaths/BO2XC0.png deleted file mode 100644 index 76e3b0fd4..000000000 Binary files a/sprites/xdeaths/BO2XC0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XD0.png b/sprites/xdeaths/BO2XD0.png deleted file mode 100644 index 4b050ea06..000000000 Binary files a/sprites/xdeaths/BO2XD0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XE0.png b/sprites/xdeaths/BO2XE0.png deleted file mode 100644 index e415d73b3..000000000 Binary files a/sprites/xdeaths/BO2XE0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XF0.png b/sprites/xdeaths/BO2XF0.png deleted file mode 100644 index b964e4acb..000000000 Binary files a/sprites/xdeaths/BO2XF0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XG0.png b/sprites/xdeaths/BO2XG0.png deleted file mode 100644 index 01aaf7ac6..000000000 Binary files a/sprites/xdeaths/BO2XG0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XH0.png b/sprites/xdeaths/BO2XH0.png deleted file mode 100644 index 3794c0398..000000000 Binary files a/sprites/xdeaths/BO2XH0.png and /dev/null differ diff --git a/sprites/xdeaths/BO2XI0.png b/sprites/xdeaths/BO2XI0.png deleted file mode 100644 index 65ee3a81e..000000000 Binary files a/sprites/xdeaths/BO2XI0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXA0.png b/sprites/xdeaths/BOSXA0.png deleted file mode 100644 index 6c5eabc81..000000000 Binary files a/sprites/xdeaths/BOSXA0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXB0.png b/sprites/xdeaths/BOSXB0.png deleted file mode 100644 index c4f34f4f2..000000000 Binary files a/sprites/xdeaths/BOSXB0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXC0.png b/sprites/xdeaths/BOSXC0.png deleted file mode 100644 index bebde393f..000000000 Binary files a/sprites/xdeaths/BOSXC0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXD0.png b/sprites/xdeaths/BOSXD0.png deleted file mode 100644 index 64e602894..000000000 Binary files a/sprites/xdeaths/BOSXD0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXE0.png b/sprites/xdeaths/BOSXE0.png deleted file mode 100644 index fa5754096..000000000 Binary files a/sprites/xdeaths/BOSXE0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXF0.png b/sprites/xdeaths/BOSXF0.png deleted file mode 100644 index c87f72ad8..000000000 Binary files a/sprites/xdeaths/BOSXF0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXG0.png b/sprites/xdeaths/BOSXG0.png deleted file mode 100644 index 20b411c78..000000000 Binary files a/sprites/xdeaths/BOSXG0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXH0.png b/sprites/xdeaths/BOSXH0.png deleted file mode 100644 index 924f74697..000000000 Binary files a/sprites/xdeaths/BOSXH0.png and /dev/null differ diff --git a/sprites/xdeaths/BOSXI0.png b/sprites/xdeaths/BOSXI0.png deleted file mode 100644 index 55cec0113..000000000 Binary files a/sprites/xdeaths/BOSXI0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXA0.png b/sprites/xdeaths/BSPXA0.png deleted file mode 100644 index 2a27d54aa..000000000 Binary files a/sprites/xdeaths/BSPXA0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXB0.png b/sprites/xdeaths/BSPXB0.png deleted file mode 100644 index bb8c1776a..000000000 Binary files a/sprites/xdeaths/BSPXB0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXC0.png b/sprites/xdeaths/BSPXC0.png deleted file mode 100644 index 109fc1183..000000000 Binary files a/sprites/xdeaths/BSPXC0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXD0.png b/sprites/xdeaths/BSPXD0.png deleted file mode 100644 index 7b9196f95..000000000 Binary files a/sprites/xdeaths/BSPXD0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXE0.png b/sprites/xdeaths/BSPXE0.png deleted file mode 100644 index 1d8a052e2..000000000 Binary files a/sprites/xdeaths/BSPXE0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXF0.png b/sprites/xdeaths/BSPXF0.png deleted file mode 100644 index 3a06c579f..000000000 Binary files a/sprites/xdeaths/BSPXF0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXG0.png b/sprites/xdeaths/BSPXG0.png deleted file mode 100644 index 0a0442962..000000000 Binary files a/sprites/xdeaths/BSPXG0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXH0.png b/sprites/xdeaths/BSPXH0.png deleted file mode 100644 index bd0cdd9ee..000000000 Binary files a/sprites/xdeaths/BSPXH0.png and /dev/null differ diff --git a/sprites/xdeaths/BSPXI0.png b/sprites/xdeaths/BSPXI0.png deleted file mode 100644 index 7a8f85b2f..000000000 Binary files a/sprites/xdeaths/BSPXI0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXA0.png b/sprites/xdeaths/CACXA0.png deleted file mode 100644 index ef9812423..000000000 Binary files a/sprites/xdeaths/CACXA0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXB0.png b/sprites/xdeaths/CACXB0.png deleted file mode 100644 index cefafa57f..000000000 Binary files a/sprites/xdeaths/CACXB0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXC0.png b/sprites/xdeaths/CACXC0.png deleted file mode 100644 index 116c53b63..000000000 Binary files a/sprites/xdeaths/CACXC0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXD0.png b/sprites/xdeaths/CACXD0.png deleted file mode 100644 index 6284de732..000000000 Binary files a/sprites/xdeaths/CACXD0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXE0.png b/sprites/xdeaths/CACXE0.png deleted file mode 100644 index d33d0b83f..000000000 Binary files a/sprites/xdeaths/CACXE0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXF0.png b/sprites/xdeaths/CACXF0.png deleted file mode 100644 index 3bcd6cbaa..000000000 Binary files a/sprites/xdeaths/CACXF0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXG0.png b/sprites/xdeaths/CACXG0.png deleted file mode 100644 index 48fdd7665..000000000 Binary files a/sprites/xdeaths/CACXG0.png and /dev/null differ diff --git a/sprites/xdeaths/CACXH0.png b/sprites/xdeaths/CACXH0.png deleted file mode 100644 index 4b3eb054f..000000000 Binary files a/sprites/xdeaths/CACXH0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXA0.png b/sprites/xdeaths/FATXA0.png deleted file mode 100644 index 36e66734a..000000000 Binary files a/sprites/xdeaths/FATXA0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXB0.png b/sprites/xdeaths/FATXB0.png deleted file mode 100644 index 8886800b7..000000000 Binary files a/sprites/xdeaths/FATXB0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXC0.png b/sprites/xdeaths/FATXC0.png deleted file mode 100644 index ffcdbac0c..000000000 Binary files a/sprites/xdeaths/FATXC0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXD0.png b/sprites/xdeaths/FATXD0.png deleted file mode 100644 index 874553e4d..000000000 Binary files a/sprites/xdeaths/FATXD0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXE0.png b/sprites/xdeaths/FATXE0.png deleted file mode 100644 index 770c1483d..000000000 Binary files a/sprites/xdeaths/FATXE0.png and /dev/null differ diff --git a/sprites/xdeaths/FATXF0.png b/sprites/xdeaths/FATXF0.png deleted file mode 100644 index 6f7954e28..000000000 Binary files a/sprites/xdeaths/FATXF0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXA0.png b/sprites/xdeaths/REVXA0.png deleted file mode 100644 index 31c28e349..000000000 Binary files a/sprites/xdeaths/REVXA0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXB0.png b/sprites/xdeaths/REVXB0.png deleted file mode 100644 index ba9154765..000000000 Binary files a/sprites/xdeaths/REVXB0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXC0.png b/sprites/xdeaths/REVXC0.png deleted file mode 100644 index 7153a6a73..000000000 Binary files a/sprites/xdeaths/REVXC0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXD0.png b/sprites/xdeaths/REVXD0.png deleted file mode 100644 index 50da4f0db..000000000 Binary files a/sprites/xdeaths/REVXD0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXE0.png b/sprites/xdeaths/REVXE0.png deleted file mode 100644 index d31647705..000000000 Binary files a/sprites/xdeaths/REVXE0.png and /dev/null differ diff --git a/sprites/xdeaths/REVXF0.png b/sprites/xdeaths/REVXF0.png deleted file mode 100644 index 6213f01f5..000000000 Binary files a/sprites/xdeaths/REVXF0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXA0.png b/sprites/xdeaths/SARXA0.png deleted file mode 100644 index 835e98bd3..000000000 Binary files a/sprites/xdeaths/SARXA0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXB0.png b/sprites/xdeaths/SARXB0.png deleted file mode 100644 index 082cd5b38..000000000 Binary files a/sprites/xdeaths/SARXB0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXC0.png b/sprites/xdeaths/SARXC0.png deleted file mode 100644 index f0ee7d113..000000000 Binary files a/sprites/xdeaths/SARXC0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXD0.png b/sprites/xdeaths/SARXD0.png deleted file mode 100644 index 38f5b3148..000000000 Binary files a/sprites/xdeaths/SARXD0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXE0.png b/sprites/xdeaths/SARXE0.png deleted file mode 100644 index cf1bd90be..000000000 Binary files a/sprites/xdeaths/SARXE0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXF0.png b/sprites/xdeaths/SARXF0.png deleted file mode 100644 index ccf81dbb6..000000000 Binary files a/sprites/xdeaths/SARXF0.png and /dev/null differ diff --git a/sprites/xdeaths/SARXG0.png b/sprites/xdeaths/SARXG0.png deleted file mode 100644 index 86077596e..000000000 Binary files a/sprites/xdeaths/SARXG0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXA0.png b/sprites/xdeaths/VILXA0.png deleted file mode 100644 index 74186e883..000000000 Binary files a/sprites/xdeaths/VILXA0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXB0.png b/sprites/xdeaths/VILXB0.png deleted file mode 100644 index 8b64fd355..000000000 Binary files a/sprites/xdeaths/VILXB0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXC0.png b/sprites/xdeaths/VILXC0.png deleted file mode 100644 index 8a28c8c66..000000000 Binary files a/sprites/xdeaths/VILXC0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXD0.png b/sprites/xdeaths/VILXD0.png deleted file mode 100644 index e3e2aa737..000000000 Binary files a/sprites/xdeaths/VILXD0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXE0.png b/sprites/xdeaths/VILXE0.png deleted file mode 100644 index bbe2fb045..000000000 Binary files a/sprites/xdeaths/VILXE0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXF0.png b/sprites/xdeaths/VILXF0.png deleted file mode 100644 index 72a090755..000000000 Binary files a/sprites/xdeaths/VILXF0.png and /dev/null differ diff --git a/sprites/xdeaths/VILXG0.png b/sprites/xdeaths/VILXG0.png deleted file mode 100644 index bde9f5d8a..000000000 Binary files a/sprites/xdeaths/VILXG0.png and /dev/null differ diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc index e63097cab..f3427ec1b 100644 --- a/zscript/handler/swwm_handler_worldthings.zsc +++ b/zscript/handler/swwm_handler_worldthings.zsc @@ -137,30 +137,6 @@ extend Class SWWMHandler let pt = Actor.Spawn("PartyTime",e.Thing.pos); pt.target = e.Thing; } - // force insert gib animations on some vanilla Doom monsters - int gibhealth = e.Thing.GetGibHealth(); - bool gotgibbed = (!e.Thing.bDONTGIB && ((e.Inflictor && e.Inflictor.bEXTREMEDEATH) || (e.DamageSource && e.DamageSource.bEXTREMEDEATH) || (e.DamageType == 'Extreme') || (e.Thing.Health < gibhealth)) && (!e.Inflictor || !e.Inflictor.bNOEXTREMEDEATH) && (!e.DamageSource || !e.DamageSource.bNOEXTREMEDEATH)); - if ( !gotgibbed ) - { - if ( profiling ) ProfileTock(PT_WORLDTHINGDIED); - return; - } - if ( (e.Thing.GetClass() == "Demon") || (e.Thing.GetClass() == "Spectre") ) - ExtraGibDeaths.GibThis(e.Thing,"DemonXDeath"); - else if ( e.Thing.GetClass() == "HellKnight" ) - ExtraGibDeaths.GibThis(e.Thing,"KnightXDeath"); - else if ( e.Thing.GetClass() == "BaronOfHell" ) - ExtraGibDeaths.GibThis(e.Thing,"BaronXDeath"); - else if ( e.Thing.GetClass() == "Cacodemon" ) - ExtraGibDeaths.GibThis(e.Thing,"CacoXDeath"); - else if ( e.Thing.GetClass() == "Revenant" ) - ExtraGibDeaths.GibThis(e.Thing,"BonerXDeath"); - else if ( e.Thing.GetClass() == "Archvile" ) - ExtraGibDeaths.GibThis(e.Thing,"VileXDeath"); - else if ( e.Thing.GetClass() == "Arachnotron" ) - ExtraGibDeaths.GibThis(e.Thing,"ArachXDeath"); - else if ( e.Thing.GetClass() == "Fatso" ) - ExtraGibDeaths.GibThis(e.Thing,"FatsoXDeath"); if ( profiling ) ProfileTock(PT_WORLDTHINGDIED); } diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index b61e8f5cb..0b2ce3829 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -808,98 +808,6 @@ Class PurpleBloodReference : Actor } } -// bare actor used for extra gib deaths -Class ExtraGibDeaths : SWWMNonInteractiveActor -{ - StateLabel gibstate; - - static void GibThis( Actor a, Statelabel st ) - { - if ( !a ) return; - let g = ExtraGibDeaths(Spawn("ExtraGibDeaths")); - g.master = a; - g.gibstate = st; - } - - void A_DoGib() - { - if ( !master ) return; - master.SetState(FindState(gibstate)); - } - - States - { - Spawn: - TNT1 A 1 NoDelay; - TNT1 A 1 A_DoGib(); - Stop; - DemonXDeath: - SARX A 5; - SARX B 5 A_XScream(); - SARX C 5 A_NoBlocking(); - SARX DEF 5; - SARX G -1; - Stop; - KnightXDeath: - BO2X A 5; - BO2X B 5 A_XScream(); - BO2X C 5; - BO2X D 5 A_NoBlocking(); - BO2X EFGH 5; - BO2X I -1; - Stop; - BaronXDeath: - BOSX A 5; - BOSX B 5 A_XScream(); - BOSX C 5; - BOSX D 5 A_NoBlocking(); - BOSX EFGH 5; - BOSX I -1 A_BossDeath(); - Stop; - CacoXDeath: - CACX A 5; - CACX B 5 A_XScream(); - CACX C 5 A_NoBlocking(); - CACX D 4; - CACX E 3; - CACX F 4; - CACX G 5; - CACX H -1; - Stop; - BonerXDeath: - REVX A 3; - REVX B 4 A_XScream(); - REVX C 5 A_NoBlocking(); - REVX DE 5; - REVX F -1; - Stop; - VileXDeath: - VILX A 5; - VILX B 5 A_XScream(); - VILX C 5 A_NoBlocking(); - VILX DEF 5; - VILX G -1; - Stop; - ArachXDeath: - BSPX A 5; - BSPX A 5 A_XScream(); - BSPX B 8 A_NoBlocking(); - BSPX C 6; - BSPX DE 6 BRIGHT; - BSPX F 5 BRIGHT; - BSPX GH 4 BRIGHT; - BSPX I -1 A_BossDeath(); - Stop; - FatsoXDeath: - FATX A 5; - FATX B 5 A_XScream(); - FATX C 5 A_NoBlocking(); - FATX DE 5; - FATX F -1 A_BossDeath(); - Stop; - } -} - // corpse thump handler Class CorpseFallTracker : Thinker {