a

theripper93 · Feb 13, 2024 · e6c8366 · e6c8366
1 parent 3df83bf
commit e6c8366
Show file tree

Hide file tree

Showing 15 changed files with 2,730 additions and 2,231 deletions.
diff --git a/index.js b/index.js
diff --git a/index.js.map b/index.js.map
diff --git a/languages/cn.json b/languages/cn.json
diff --git a/languages/de.json b/languages/de.json
diff --git a/languages/en.json b/languages/en.json
diff --git a/languages/es.json b/languages/es.json
diff --git a/languages/fr.json b/languages/fr.json
diff --git a/languages/it.json b/languages/it.json
diff --git a/languages/ja.json b/languages/ja.json
diff --git a/languages/ko.json b/languages/ko.json
diff --git a/languages/pl.json b/languages/pl.json
diff --git a/languages/pt-br.json b/languages/pt-br.json
diff --git a/languages/ru.json b/languages/ru.json
diff --git a/scripts/config.js b/scripts/config.js
@@ -1083,9 +1083,15 @@ export function initConfig() {
             }
         }
 
+        const enableMacroPanel = game.settings.get(MODULE_ID, "macroPanel");
+
+        const mainPanels = [DND5eActionActionPanel, DND5eBonusActionPanel, DND5eReactionActionPanel, DND5eFreeActionPanel, DND5eLegActionPanel, DND5eLairActionPanel, DND5eMythicActionPanel]
+        if(enableMacroPanel) mainPanels.push(ARGON.PREFAB.MacroPanel);
+        mainPanels.push(ARGON.PREFAB.PassTurnPanel);
+
         CoreHUD.definePortraitPanel(DND5ePortraitPanel);
         CoreHUD.defineDrawerPanel(DND5eDrawerPanel);
-        CoreHUD.defineMainPanels([DND5eActionActionPanel, DND5eBonusActionPanel, DND5eReactionActionPanel, DND5eFreeActionPanel, DND5eLegActionPanel, DND5eLairActionPanel, DND5eMythicActionPanel, ARGON.PREFAB.PassTurnPanel]);
+        CoreHUD.defineMainPanels(mainPanels);
         CoreHUD.defineMovementHud(DND5eMovementHud);
         CoreHUD.defineButtonHud(DND5eButtonHud);
         CoreHUD.defineWeaponSets(DND5eWeaponSets);

diff --git a/scripts/settings.js b/scripts/settings.js
@@ -37,6 +37,16 @@ export function registerSettings() {
             default: true,
             onChange: () => ui.ARGON.refresh(),
         },
+        macroPanel: {
+            name: game.i18n.localize("enhancedcombathud-dnd5e.settings.macroPanel.name"),
+            hint: game.i18n.localize("enhancedcombathud-dnd5e.settings.macroPanel.hint"),
+            scope: "world",
+            config: true,
+            type: Boolean,
+            default: false,
+            requiresReload: true,
+            onChange: () => ui.ARGON.refresh(),
+        },
         switchEquip: {
             name: game.i18n.localize("enhancedcombathud-dnd5e.settings.switchEquip.name"),
             hint: game.i18n.localize("enhancedcombathud-dnd5e.settings.switchEquip.hint"),