From 620db2ffba2d83f50d043823bbcf54dccaa902ab Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 14 Sep 2023 21:12:20 +0200 Subject: [PATCH] Fix abort when using item sense near chanceboxes. --- language.version | 4 ++-- zscript/hud/swwm_hud_target.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index dc1920dcf..8116709e5 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r955 \cu(Thu 14 Sep 12:45:34 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r955 \cu(2023-09-14 12:45:34)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r955 \cu(Thu 14 Sep 21:12:20 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r955 \cu(2023-09-14 21:12:20)\c-"; diff --git a/zscript/hud/swwm_hud_target.zsc b/zscript/hud/swwm_hud_target.zsc index dc4f5b320..3cb0ffe5e 100644 --- a/zscript/hud/swwm_hud_target.zsc +++ b/zscript/hud/swwm_hud_target.zsc @@ -75,7 +75,7 @@ extend Class SWWMStatusBar else if ( i is 'MagAmmo' ) col = s.vipitem?Font.FindFontColor('VIPTan'):Font.CR_TAN; else if ( (i is 'BackpackItem') || (i is 'HammerspaceEmbiggener') ) col = Font.CR_DARKBROWN; else if ( i is 'Ammo' ) col = s.vipitem?Font.FindFontColor('VIPBrown'):Font.CR_BROWN; - else if ( (i is 'PowerupGiver') || (i is 'AmmoFabricator') || Inventory(i).bBIGPOWERUP ) col = s.vipitem?Font.FindFontColor('VIPPurple'):Font.CR_PURPLE; + else if ( (i is 'PowerupGiver') || (i is 'AmmoFabricator') || (i is 'Chancebox') || ((i is 'Inventory') && Inventory(i).bBIGPOWERUP) ) col = s.vipitem?Font.FindFontColor('VIPPurple'):Font.CR_PURPLE; else if ( (i is 'Health') || (i is 'HealthPickup') || (i is 'SWWMHealth') ) col = Font.CR_RED; else if ( (i is 'Armor') || (i is 'SWWMSpareArmor') ) col = Font.CR_GREEN; else if ( i is 'PuzzleItem' ) col = Font.CR_LIGHTBLUE;