OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove Dragon's Breath shells.

Browse source 
Nuggets can no longer be stored as spares.
This commit is contained in:
Mari the Deer 2022-06-04 22:09:46 +02:00
commit 93ac4d3a4f
45 changed files with 612 additions and 1028 deletions
Download patch file Download diff file Expand all files Collapse all files

5
zscript/kbase/swwm_kbasetab_store.zsc
View file

@ -107,6 +107,9 @@ Class DemolitionistStoreTab : DemolitionistMenuTab
{
// skip maxed items if buying
if ( cur && (cur.Amount >= cur.MaxAmount) ) return true;
// nuggets are skipped if more can't be picked up
if ( (type is 'HealthNuggetItem') && (players[consoleplayer].Health >= GetDefaultByType('HealthNugget').MaxAmount) ) return true;
if ( (type is 'ArmorNuggetItem') && (players[consoleplayer].mo.CountInv('ArmorNugget') >= GetDefaultByType('ArmorNugget').MaxAmount) ) return true;
// ignore ammo for weapons not owned if buying
bool notownedammo = false;
if ( type is 'Ammo' )
@ -600,7 +603,7 @@ Class DemolitionistMenuStoreItem : DemolitionistMenuListItem
camt = 0;
max = GetDefaultByType(inv).MaxAmount;
}
if ( camt >= max )
if ( (max > 0) && (camt >= max) )
{
master.MenuSound("menu/noinvuse");
master.tmsg = StringTable.Localize("$SWWM_STOREFULL");