From 3afaf4e182cf830b9e18a6b851ca94fcb1736e14 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 27 Jun 2021 11:14:11 +0200 Subject: [PATCH] I WANT DIE duplication tweaking. --- language.version | 4 ++-- zscript/handler/swwm_handler_iwantdie.zsc | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index f1c8e7f42..a47500b32 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r558 \cu(Sun 27 Jun 11:13:39 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r558 \cu(2021-06-27 11:13:39)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r559 \cu(Sun 27 Jun 11:14:11 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r559 \cu(2021-06-27 11:14:11)\c-"; diff --git a/zscript/handler/swwm_handler_iwantdie.zsc b/zscript/handler/swwm_handler_iwantdie.zsc index e7d0f818e..c82185c2a 100644 --- a/zscript/handler/swwm_handler_iwantdie.zsc +++ b/zscript/handler/swwm_handler_iwantdie.zsc @@ -50,6 +50,8 @@ extend Class SWWMHandler if ( e.Thing.bISMONSTER && !(e.Thing is 'PlayerPawn') ) { e.Thing.GiveInventory("HOLYCOWIMTOTALLYGOINGSOFASTOHFUCK",1); + // avoid if it has some sort of special handling + if ( e.Thing.special || e.Thing.tid || e.Thing.bDORMANT ) return; // random chance to spawn doubles if ( !e.Thing.FindInventory("DontDuplicate") && !Random[ExtraMissiles](0,2) ) { @@ -70,6 +72,7 @@ extend Class SWWMHandler else { x.angle = e.Thing.angle; + x.bAMBUSH = e.Thing.bAMBUSH; x.GiveInventory("DontDuplicate",1); break; }