From 4763fc54f2e869b28854669dfe7aa7a18ea9cf05 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 18 Aug 2020 13:35:45 +0200 Subject: [PATCH] Small fixups. --- language.version | 2 +- zscript/swwm_common.zsc | 1 + zscript/swwm_menu.zsc | 7 ++++--- zscript/swwm_player.zsc | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/language.version b/language.version index d03396d40..53d3cba28 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r493 (Tue 18 Aug 13:14:47 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r494 (Tue 18 Aug 13:35:45 CEST 2020)"; diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 4eec4fd43..84730db62 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -954,6 +954,7 @@ Class SWWMLoreLibrary : Thinker { if ( ref ~== "Cronos" ) return true; if ( ref ~== "Kirin" ) return true; // not met + if ( ref ~== "AmmoFabricator" ) return true; // not yet introduced } if ( !(gameinfo.gametype&GAME_Strife) ) { diff --git a/zscript/swwm_menu.zsc b/zscript/swwm_menu.zsc index 9582d306d..99cb8f96b 100644 --- a/zscript/swwm_menu.zsc +++ b/zscript/swwm_menu.zsc @@ -590,7 +590,8 @@ Class SWWMKnowledgeBaseMenu : GenericMenu if ( (curtab == TAB_INVENTORY) && (invlist.Size() > 0) && (sel0 < invlist.Size()) ) { // can't use this - if ( (invlist[sel0] is 'Ammo') || (invlist[sel0] is 'MagAmmo') || (invlist[sel0] is 'SWWMCollectable') ) + if ( (invlist[sel0] is 'Ammo') || (invlist[sel0] is 'MagAmmo') || (invlist[sel0] is 'SWWMCollectable') + || (invlist[sel0] is 'HammerspaceEmbiggener') ) return true; let t = new("MenuTransaction"); t.uid = GenTUID(); @@ -1709,8 +1710,8 @@ Class SWWMKnowledgeBaseMenu : GenericMenu if ( !type ) continue; // no collectables if ( type is 'SWWMCollectable' ) continue; - // no fabricators outside of hexen - if ( !(gameinfo.gametype&GAME_Hexen) && (type is 'AmmoFabricator') ) continue; + // no fabricators before hexen + if ( !(gameinfo.gametype&(GAME_Hexen|GAME_Strife)) && (type is 'AmmoFabricator') ) continue; // skip maxed items let cur = players[consoleplayer].mo.FindInventory(type); if ( cur && (cur.Amount >= cur.MaxAmount) ) continue; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 30ac654ad..277e8a988 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -223,7 +223,7 @@ Class Demolitionist : PlayerPawn { let type = (class)(AllActorClasses[i]); if ( !type ) continue; - if ( !(gameinfo.gametype&GAME_Hexen) && (type is 'AmmoFabricator') ) continue; // no fabricators outside of hexen + if ( !(gameinfo.gametype&(GAME_Hexen|GAME_Strife)) && (type is 'AmmoFabricator') ) continue; // no fabricators before hexen let def = GetDefaultByType (type); if ( def.Icon.isValid() && !(type is "PuzzleItem") && !(type is "Powerup") && !(type is "Ammo") && !(type is "Armor") && !(type is "Key") )