From 39b2beda67dfb8999305d0b8b235f14527c21509 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 7 Sep 2020 14:53:57 +0200 Subject: [PATCH] Fix Silver Bullet ignoring spare bullets on CheckAmmo --- language.version | 2 +- zscript/swwm_thiccboolet.zsc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 1ababd350..b6ac936d8 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r528 (Fri 4 Sep 20:26:50 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r529 (Mon 7 Sep 14:53:57 CEST 2020)"; diff --git a/zscript/swwm_thiccboolet.zsc b/zscript/swwm_thiccboolet.zsc index 9767eaf3d..1ef0deb19 100644 --- a/zscript/swwm_thiccboolet.zsc +++ b/zscript/swwm_thiccboolet.zsc @@ -623,7 +623,7 @@ Class SilverBullet : SWWMWeapon override bool ReportHUDAmmo() { if ( (chambered && !fired) || (clipcount > 0) ) return true; - if ( (Ammo1.Amount <= 0) && (Ammo2.Amount <= 0) && (CountInv("SilverBullets") <= 0) && (CountInv("SilverBullets2") <= 0) ) return false; + if ( (Ammo1.Amount <= 0) && (Ammo2.Amount <= 0) && (Owner.CountInv("SilverBullets") <= 0) && (Owner.CountInv("SilverBullets2") <= 0) ) return false; return true; } override bool CheckAmmo( int firemode, bool autoswitch, bool requireammo, int ammocount ) @@ -634,7 +634,7 @@ Class SilverBullet : SWWMWeapon // allow player to still use the zoom even if there's no ammo left // (should work fine, assuming I've correctly interpreted the execution chain of all this stuff) if ( autoswitch && (fireMode == AltFire) ) return true; - return ((chambered && !fired) || (clipcount > 0) || (Ammo1.Amount > 0) || (Ammo2.Amount > 0) || (CountInv("SilverBullets") > 0) || (CountInv("SilverBullets2") > 0)); + return ((chambered && !fired) || (clipcount > 0) || (Ammo1.Amount > 0) || (Ammo2.Amount > 0) || (Owner.CountInv("SilverBullets") > 0) || (Owner.CountInv("SilverBullets2") > 0)); } return Super.CheckAmmo(firemode,autoswitch,requireammo,ammocount); }