From c7d741853ec01d7effb63cefd5cf21c20f8c99d7 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 8 Oct 2022 17:50:05 +0200 Subject: [PATCH] Missed a lil' thing. --- language.version | 4 ++-- zscript/utility/swwm_utility.zsc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index b60cc07b0..6d6520e81 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r559 \cu(Sat 8 Oct 17:47:35 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r559 \cu(2022-10-08 17:47:35)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r560 \cu(Sat 8 Oct 17:50:05 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r560 \cu(2022-10-08 17:50:05)\c-"; diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index e01ce565c..61af0468e 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -2027,8 +2027,8 @@ Class SWWMUtility if ( !(i is 'Weapon') ) continue; let w = Weapon(i); if ( (w is 'SWWMWeapon') && SWWMWeapon(w).bNOFIRSTGIVE ) continue; - if ( w.Ammo1 ) w.Ammo1.Amount = min(w.Ammo1.MaxAmount,w.Ammo1.Amount+w.AmmoGive1); - if ( w.Ammo2 && (w.Ammo2 != w.Ammo1) ) w.Ammo2.Amount = min(w.Ammo2.MaxAmount,w.Ammo2.Amount+w.AmmoGive2); + if ( w.Ammo1 ) w.Ammo1.Amount = min(w.Ammo1.MaxAmount,w.Ammo1.Amount+w.default.AmmoGive1); + if ( w.Ammo2 && (w.Ammo2 != w.Ammo1) ) w.Ammo2.Amount = min(w.Ammo2.MaxAmount,w.Ammo2.Amount+w.default.AmmoGive2); } }