From 067dbb2be3bd7663e1b650bc263366fa52cd070e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 30 Nov 2021 18:29:33 +0100 Subject: [PATCH] Damage accumulators now report damage amplified by Devastation Sigil. --- language.version | 4 ++-- zscript/swwm_thinkers.zsc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index e2089ee17..75eb886f1 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r61 \cu(Tue 30 Nov 18:16:39 CET 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r61 \cu(2021-11-30 18:16:39)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r62 \cu(Tue 30 Nov 18:29:33 CET 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r62 \cu(2021-11-30 18:29:33)\c-"; diff --git a/zscript/swwm_thinkers.zsc b/zscript/swwm_thinkers.zsc index 510182215..00c82a518 100644 --- a/zscript/swwm_thinkers.zsc +++ b/zscript/swwm_thinkers.zsc @@ -145,6 +145,8 @@ Class SWWMDamageAccumulator : Thinker while ( a = SWWMDamageAccumulator(ti.Next()) ) { if ( a.victim != victim ) continue; + if ( a.source && a.source.FindInventory("AngeryPower") ) + return (a.total>85899345)?int.max:(a.total*25); return a.total; } return 0;