From cdd7f74ff6332c5152cf2201ad37f7d76592f929 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 14 Feb 2021 18:09:00 +0100 Subject: [PATCH] Centaurs take corrosive damage while shielded. --- language.version | 4 ++-- zscript/swwm_shot.zsc | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 8ace8228f..a5faf9b86 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r272 \cu(Sun 14 Feb 18:00:50 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r272 \cu(2021-02-14 18:00:50)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r273 \cu(Sun 14 Feb 18:09:00 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r273 \cu(2021-02-14 18:09:00)\c-"; diff --git a/zscript/swwm_shot.zsc b/zscript/swwm_shot.zsc index 76c587c15..128c25cbb 100644 --- a/zscript/swwm_shot.zsc +++ b/zscript/swwm_shot.zsc @@ -917,7 +917,9 @@ Class CorrodeDebuff : Inventory if ( !Random[Corrode](0,3) && (Owner.Health > 0) ) Owner.Howl(); double maxrad = max(Owner.radius,Owner.height); int defh = Owner.GetSpawnHealth(); - Owner.DamageMobj(self,instigator?instigator:Actor(self),clamp(Amount/8,1,50),'Corroded',DMG_THRUSTLESS); + int flg = DMG_THRUSTLESS; + if ( Owner is 'Centaur' ) flg |= DMG_FOILINVUL; // you're melting, that shield is worthless + Owner.DamageMobj(self,instigator?instigator:Actor(self),clamp(Amount/8,1,50),'Corroded',flg); bool justdied = (wasalive && (!Owner || (Owner.Health <= 0))); if ( justdied ) {