OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Small fixups.

Browse source
This commit is contained in:
Mari the Deer 2020-08-18 13:35:45 +02:00
commit 4763fc54f2
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zscript/swwm_common.zsc
View file

@ -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) )
{

7
zscript/swwm_menu.zsc
View file

@ -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;

2
zscript/swwm_player.zsc
View file

@ -223,7 +223,7 @@ Class Demolitionist : PlayerPawn
{
let type = (class<Inventory>)(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") )