From 8ced02ec74d78451cea87928956b97077ea72eb4 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 22 Jan 2023 01:47:41 +0100 Subject: [PATCH] Forgot to remove some code from the old vanilla monster xdeath stuff. --- language.version | 4 ++-- zscript/handler/swwm_handler_damage.zsc | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/language.version b/language.version index ce24c6bfc..34b459cdc 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r746 \cu(Sun 22 Jan 00:46:28 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r746 \cu(2023-01-22 00:46:28)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r747 \cu(Sun 22 Jan 01:47:41 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r747 \cu(2023-01-22 01:47:41)\c-"; diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index a73af2a87..456a848c6 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -19,11 +19,7 @@ extend Class SWWMHandler if ( (e.DamageType == 'Ynykron') || (e.DamageType == 'Massacre') ) return; 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)); - bool forcegibbed = false; - // force gib availability for some vanilla Doom monsters - if ( gotgibbed && ((e.Thing.GetClass() == "Demon") || (e.Thing.GetClass() == "Spectre") || (e.Thing.GetClass() == "HellKnight") || (e.Thing.GetClass() == "BaronOfHell") || (e.Thing.GetClass() == "Cacodemon") || (e.Thing.GetClass() == "Revenant") || (e.Thing.GetClass() == "Archvile") || (e.Thing.GetClass() == "Fatso") || (e.Thing.GetClass() == "Arachnotron")) ) - forcegibbed = true; - if ( !e.Thing.FindState("XDeath",true) && !e.Thing.FindState("Death.Extreme",true) && !forcegibbed ) + if ( !e.Thing.FindState("XDeath",true) && !e.Thing.FindState("Death.Extreme",true) ) gotgibbed = false; // only do special handling if they use our blood if ( (e.Thing.GetBloodType(0) != "mkBlood") || e.Thing.bNOBLOOD )