diff --git a/language.version b/language.version index 3a1cdd220..11d6a85b4 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r771 \cu(Fri 10 Mar 19:42:05 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r771 \cu(2023-03-10 19:42:05)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r772 \cu(Fri 10 Mar 20:39:22 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r772 \cu(2023-03-10 20:39:22)\c-"; diff --git a/zscript/kbase/swwm_kbasetab_inventory.zsc b/zscript/kbase/swwm_kbasetab_inventory.zsc index 91bef2ba6..24d189261 100644 --- a/zscript/kbase/swwm_kbasetab_inventory.zsc +++ b/zscript/kbase/swwm_kbasetab_inventory.zsc @@ -14,18 +14,20 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab else if ( (a is 'BackpackItem') || (a is 'HammerspaceEmbiggener') ) ta = 3; else if ( a is 'Ammo' ) ta = 4; else if ( a is 'MagAmmo' ) ta = 5; - else if ( (a is 'PowerupGiver') || (a is 'AmmoFabricator') || a.bBIGPOWERUP ) ta = -3; + else if ( (a is 'PowerupGiver') || (a is 'AmmoFabricator') || a.bBIGPOWERUP ) ta = -4; else if ( (a is 'Health') || (a is 'HealthPickup') || (a is 'SWWMHealth') ) ta = -2; else if ( (a is 'Armor') || (a is 'SWWMSpareArmor') ) ta = -1; else if ( a is 'PuzzleItem' ) ta = 1; + else if ( a.bINVBAR ) ta = -3; if ( b is 'Weapon' ) tb = 2; else if ( (b is 'BackpackItem') || (b is 'HammerspaceEmbiggener') ) tb = 3; else if ( b is 'Ammo' ) tb = 4; else if ( b is 'MagAmmo' ) tb = 5; - else if ( (b is 'PowerupGiver') || (b is 'AmmoFabricator') || b.bBIGPOWERUP ) tb = -3; + else if ( (b is 'PowerupGiver') || (b is 'AmmoFabricator') || b.bBIGPOWERUP ) tb = -4; else if ( (b is 'Health') || (b is 'HealthPickup') || (b is 'SWWMHealth') ) tb = -2; else if ( (b is 'Armor') || (b is 'SWWMSpareArmor') ) tb = -1; else if ( b is 'PuzzleItem' ) tb = 1; + else if ( b.bINVBAR ) tb = -3; if ( ta == tb ) { if ( a is 'Weapon' ) @@ -497,6 +499,7 @@ Class DemolitionistMenuInvItem : DemolitionistMenuListItem else if ( i is 'PuzzleItem' ) col = Font.CR_LIGHTBLUE; else if ( i is 'Key' ) col = Font.CR_UNTRANSLATED; else if ( i is 'SWWMCollectible' ) col = Font.CR_PURPLE; + else if ( i.bINVBAR ) col = Font.CR_CYAN; UpdateLabel(); return self; } diff --git a/zscript/kbase/swwm_kbasetab_store.zsc b/zscript/kbase/swwm_kbasetab_store.zsc index be9d508e5..2306081c1 100644 --- a/zscript/kbase/swwm_kbasetab_store.zsc +++ b/zscript/kbase/swwm_kbasetab_store.zsc @@ -19,15 +19,17 @@ Class DemolitionistStoreTab : DemolitionistMenuTab else if ( a is 'Ammo' ) ta = 2; else if ( a is 'MagAmmo' ) ta = 1; else if ( (a is 'PowerupGiver') || (a is 'AmmoFabricator') || da.bBIGPOWERUP ) ta = 5; - else if ( (a is 'Health') || (a is 'HealthPickup') || (a is 'SWWMHealth') ) ta = 7; - else if ( (a is 'Armor') || (a is 'SWWMSpareArmor') ) ta = 6; + else if ( (a is 'Health') || (a is 'HealthPickup') || (a is 'SWWMHealth') ) ta = 8; + else if ( (a is 'Armor') || (a is 'SWWMSpareArmor') ) ta = 7; + else if ( da.bINVBAR ) ta = 6; if ( b is 'Weapon' ) tb = 4; else if ( b is 'HammerspaceEmbiggener' ) tb = 3; else if ( b is 'Ammo' ) tb = 2; else if ( b is 'MagAmmo' ) ta = 1; else if ( (b is 'PowerupGiver') || (b is 'AmmoFabricator') || db.bBIGPOWERUP ) tb = 5; - else if ( (b is 'Health') || (b is 'HealthPickup') || (b is 'SWWMHealth') ) tb = 7; - else if ( (b is 'Armor') || (b is 'SWWMSpareArmor') ) tb = 6; + else if ( (b is 'Health') || (b is 'HealthPickup') || (b is 'SWWMHealth') ) tb = 8; + else if ( (b is 'Armor') || (b is 'SWWMSpareArmor') ) tb = 7; + else if ( db.bINVBAR ) tb = 6; if ( ta == tb ) { // sort by unit price @@ -436,6 +438,7 @@ Class DemolitionistMenuStoreItem : DemolitionistMenuListItem else if ( (i is 'PowerupGiver') || (i is 'AmmoFabricator') || def.bBIGPOWERUP ) col = SWWMUtility.IsVIPItemClass(i)?Font.FindFontColor('VIPPurple'):Font.CR_PURPLE; else if ( (i is 'Health') || (i is 'HealthPickup') || (i is 'SWWMHealth') ) col = Font.CR_RED; else if ( (i is 'Armor') || (i is 'SWWMSpareArmor') ) col = Font.CR_GREEN; + else if ( def.bINVBAR ) col = Font.CR_CYAN; self.bSell = bSell; UpdateLabel(); return self;