Make artifacts menu openable with separate button.

Author: sidav

LANGUAGE.de

@@ -24,6 +24,7 @@ RWSETTINGS_HP_SCALING_SPEED = "Monster GP-Skalierungsgeschwindigkeit";
 RWMENU_CONTROLS_HEADER = "DOOMablo Steuerung";
 RWSETTINGS_SCRAPITEMBTN = "Einen Artefakt verschrotten";
 RWSETTINGS_SCRAPITEMTIME = "Zeit für Verschrottung (sekunden)";
+RWSETTINGS_EQUIPPEDARTIFACTSSCREENBTN = "Schirm für ausgerüstete Artefakten öffnen";
 RWSETTINGS_CHARACTERSCREENBTN = "Charakter-Bildschirm öffnen";
 
 // Generic

LANGUAGE.default

@@ -24,6 +24,7 @@ RWSETTINGS_HP_SCALING_SPEED = "Monster HP scaling speed modifier";
 RWMENU_CONTROLS_HEADER = "DOOMablo Controls";
 RWSETTINGS_SCRAPITEMBTN = "Scrap item";
 RWSETTINGS_SCRAPITEMTIME = "Item scrapping time (seconds)";
+RWSETTINGS_EQUIPPEDARTIFACTSSCREENBTN = "Open equipped artifacts screen";
 RWSETTINGS_CHARACTERSCREENBTN = "Open Character Screen";
 
 // Generic

MENUDEF.txt

@@ -40,6 +40,7 @@ OptionMenu "RW_Options"
 	StaticText "$RWMENU_CONTROLS_HEADER", 1
 	Control "$RWSETTINGS_SCRAPITEMBTN", "+user1"
 	Slider "$RWSETTINGS_SCRAPITEMTIME", "rw_settings_scrapping_time", 0.5, 3.0, 0.1, 2
+	Control "$RWSETTINGS_EQUIPPEDARTIFACTSSCREENBTN", "+user3"
 	Control "$RWSETTINGS_CHARACTERSCREENBTN", "+user4"
 }
 

zscript.zsc

@@ -82,9 +82,9 @@ version "4.10.0"
 // Player menus
 #include "zscript/player/menus/rw_base_menu.zs"
 #include "zscript/player/menus/switch_menu_button.zs"
-#include "zscript/player/menus/artifacts_menu/artifact_button.zs"
-#include "zscript/player/menus/artifacts_menu/handler.zs"
-#include "zscript/player/menus/artifacts_menu/menu.zs"
+#include "zscript/player/menus/equipped_artifacts_menu/artifact_button.zs"
+#include "zscript/player/menus/equipped_artifacts_menu/handler.zs"
+#include "zscript/player/menus/equipped_artifacts_menu/menu.zs"
 #include "zscript/player/menus/levelup_menu/levelup_button.zs"
 #include "zscript/player/menus/levelup_menu/handler.zs"
 #include "zscript/player/menus/levelup_menu/menu.zs"

zscript/player/base_player.zs

@@ -52,6 +52,9 @@ class RwPlayer : DoomPlayer // Base class; should not be created directly
         } else {
             scrapItemButtonPressedTicks = 0;
         }
+        if (Player.cmd.buttons & BT_USER3) {
+            Menu.SetMenu('RWEquippedArtifactsMenu');
+        }
         if (Player.cmd.buttons & BT_USER4) {
             Menu.SetMenu('RWLevelupMenu');
         }

zscript/player/menus/artifacts_menu/artifact_button.zs zscript/player/menus/equipped_artifacts_menu/artifact_button.zs

@@ -2,7 +2,7 @@ class ArtifactsMenuHandler : ZFHandler
 {
     // The menu this command handler belongs to.
     // We need this to be able to do anything with our menu.
-    RWArtifactsMenu link;
+    RWEquippedArtifactsMenu link;
     RwHudArtifactStatsCollector collector;
     const itemTitleScale = 1.1;
 

zscript/player/menus/artifacts_menu/handler.zs zscript/player/menus/equipped_artifacts_menu/handler.zs

@@ -1,4 +1,4 @@
-class RWArtifactsMenu : RwBaseMenu {
+class RWEquippedArtifactsMenu : RwBaseMenu {
     ArtifactsMenuHandler handler;
 
     array<ArtifactButton> artifactButtons;

zscript/player/menus/artifacts_menu/menu.zs zscript/player/menus/equipped_artifacts_menu/menu.zs

@@ -20,8 +20,9 @@ class RWLevelupMenu : RwBaseMenu {
             fnt: smallFont, Alignment: 2, wrap: true, autoSize: true, textScale: 2., textColor: Font.CR_WHITE);
         TitleLabel.Pack(mainFrame);
 
-        let switchBtn = SwitchMenuButton.Make(handler, 745, 505, "Equipment", 'RWArtifactsMenu', 1);
-        switchBtn.Pack(mainFrame);
+        // Temporarily disabled.
+        // let switchBtn = SwitchMenuButton.Make(handler, 745, 505, "Equipment", 'RWEquippedArtifactsMenu', 1);
+        // switchBtn.Pack(mainFrame);
 
         let plr = RwPlayer(players[consoleplayer].mo);