OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix handling of inventory resets.

Browse source
This commit is contained in:
Mari the Deer 2021-11-05 23:29:14 +01:00
commit 61824088ff
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.39 \cu(Fri 5 Nov 20:53:58 CET 2021)\c-";
SWWM_SHORTVER="\cw1.1.39 \cu(2021-11-05 20:53:58)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.40 \cu(Fri 5 Nov 23:29:26 CET 2021)\c-";
SWWM_SHORTVER="\cw1.1.40 \cu(2021-11-05 23:29:26)\c-";

14
zscript/utility/swwm_utility.zsc
View file

@ -1877,18 +1877,24 @@ Class SWWMUtility
}
// sets all carried ammo back to zero
// resets hammerspace capacity
static play void ResetAmmo( Actor mo )
{
PlayerInfo p = mo.player;
if ( !p || !p.mo ) return;
for ( Inventory i=p.mo.inv; i; i=i.inv )
{
if ( !(i is 'Ammo') ) continue;
i.Amount = 0;
if ( i is 'Ammo' )
{
i.Amount = 0;
i.MaxAmount = i.default.MaxAmount;
}
if ( i is 'HammerspaceEmbiggener' )
i.Amount = 0;
}
}
// removes all carried items that aren't weapons or ammo
// removes all usable items
static play void ResetItems( Actor mo )
{
PlayerInfo p = mo.player;
@ -1897,7 +1903,7 @@ Class SWWMUtility
while ( last.inv )
{
let inv = last.inv;
if ( (inv is 'SWWMCollectible') || (inv is 'Weapon') || (inv is 'Ammo') || (inv is 'SWWMArmor') )
if ( !inv.bINVBAR )
{
last = inv;
continue;