diff --git a/language.version b/language.version index bb91fc576..a019d66a9 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r227 \cu(Thu 28 Jul 21:01:08 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r227 \cu(2022-07-28 21:01:08)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r228 \cu(Thu 28 Jul 23:42:57 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r228 \cu(2022-07-28 23:42:57)\c-"; diff --git a/zscript/items/swwm_armor.zsc b/zscript/items/swwm_armor.zsc index a9cf7d88d..d1988b896 100644 --- a/zscript/items/swwm_armor.zsc +++ b/zscript/items/swwm_armor.zsc @@ -48,7 +48,7 @@ Class ArmorNuggetItem : SWWMSpareArmor Default { Tag "$T_NUGGETA"; - Stamina 1200; + Stamina -1200; Inventory.PickupMessage "$T_NUGGETA"; Inventory.MaxAmount 0; Inventory.InterHubAmount 0; diff --git a/zscript/items/swwm_health.zsc b/zscript/items/swwm_health.zsc index a61358dab..d84058e5e 100644 --- a/zscript/items/swwm_health.zsc +++ b/zscript/items/swwm_health.zsc @@ -92,7 +92,7 @@ Class HealthNuggetItem : SWWMHealth Default { Tag "$T_NUGGETH"; - Stamina 500; + Stamina -500; Inventory.PickupMessage "$T_NUGGETH"; Inventory.MaxAmount 0; Inventory.InterHubAmount 0; diff --git a/zscript/kbase/swwm_kbasetab_store.zsc b/zscript/kbase/swwm_kbasetab_store.zsc index 9c780bb1d..d0c397cfc 100644 --- a/zscript/kbase/swwm_kbasetab_store.zsc +++ b/zscript/kbase/swwm_kbasetab_store.zsc @@ -107,9 +107,6 @@ 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' ) @@ -498,36 +495,6 @@ Class DemolitionistMenuStoreItem : DemolitionistMenuListItem } } } - // nuggets can be bought in bulk - else if ( inv is 'HealthNuggetItem' ) - { - let def2 = GetDefaultByType(SWWMHealth(def).giveme); - int maxamt = int(ceil((def2.MaxAmount-players[consoleplayer].Health)/double(def2.Amount))); - for ( int j=5; j<=25; j+=5 ) - { - int cprice = int(def.Stamina*(1.+.75*(j-1))); - if ( (j <= maxamt) && SWWMCredits.CanTake(players[consoleplayer],cprice) ) - { - price = cprice; - amt = j; - } - } - } - else if ( inv is 'ArmorNuggetItem' ) - { - let def2 = GetDefaultByType(SWWMSpareArmor(def).giveme); - let cur2 = players[consoleplayer].mo.FindInventory(SWWMSpareArmor(def).giveme); - int maxamt = int(ceil((cur2?(cur2.MaxAmount-cur2.Amount):def2.MaxAmount)/double(def2.Amount))); - for ( int j=5; j<=20; j+=5 ) - { - int cprice = int(def.Stamina*(1.+.75*(j-1))); - if ( (j <= maxamt) && SWWMCredits.CanTake(players[consoleplayer],cprice) ) - { - price = cprice; - amt = j; - } - } - } if ( bSell && (inv is 'Weapon') ) { let w = GetDefaultByType((Class)(inv));