From 7a079b4f682107f46ae1188dfa6dcd9561571530 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Mon, 3 Oct 2022 19:00:01 +0200 Subject: [PATCH] Fix Mortal Rifle showing red slot even if rounds available. --- language.version | 4 ++-- zscript/dlc1/swwm_mister.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index bc6e31fda..d68a411ba 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r537 \cu(Mon 3 Oct 00:21:57 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r537 \cu(2022-10-03 00:21:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r538 \cu(Mon 3 Oct 19:00:01 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r538 \cu(2022-10-03 19:00:01)\c-"; diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 138f7d9b2..93c28f267 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -254,7 +254,7 @@ Class MisterRifle : SWWMWeapon override bool ReportHUDAmmo() { - return (chambered&&!fired)||(clipcount>0)||(Ammo1.Amount>0)||(gchambered&&!gfired)||(Ammo2.Amount>0); + return (chambered&&!fired)||(clipcount>0)||(Ammo1.Amount>0)||(Owner.CountInv("MisterRound")>0)||(gchambered&&!gfired)||(Ammo2.Amount>0); } override bool CheckAmmo( int firemode, bool autoswitch, bool requireammo, int ammocount )