1.0.38

chrisk123999 · Nov 5, 2024 · 7059197 · 7059197
1 parent d41984e
commit 7059197
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.38 Release:
+## API Bug Fixes:
+- Macro Registration
+
 # 1.0.37 Release:
 ## New Generic Monster Features:
 - Shield Guardian: Shield & Spell Storing

diff --git a/scripts/events/auras.js b/scripts/events/auras.js
@@ -168,7 +168,6 @@ async function executeMacro(trigger, options) {
 }
 async function executeMacroPass(tokens, pass, token, options) {
     genericUtils.log('dev', 'Executing Aura Macro Pass: ' + pass + ' for ' + token.name);
-    let inCombat = combatUtils.inCombat();
     let triggers = getSortedTriggers(tokens, pass, token);
     let removedEffects = [];
     let effects = actorUtils.getEffects(token.actor).filter(j => j.flags['chris-premades']?.aura);

diff --git a/scripts/events/custom.js b/scripts/events/custom.js
@@ -19,7 +19,7 @@ async function ready() {
     }))).filter(j => j);
 }
 function getMacro(identifier) {
-    return customMacroList.find(i => i.identifier === identifier) ?? macros[identifier];
+    return customMacroList.find(i => i.identifier === identifier) ?? registeredMacroList.find(j => j.identifier === identifier) ?? macros[identifier];
 }
 function preCreateMacro(document, updates, options, userId) {
     let key = genericUtils.getCPRSetting('macroCompendium');

diff --git a/scripts/extensions/update.js b/scripts/extensions/update.js
@@ -21,7 +21,9 @@ export async function updateCheck() {
             .replaceAll('Updated Content:', '<b><u>Updated Content:</u></b>')
             .replaceAll('Bug Fixes:', '<b><u>Bug Fixes:</u></b>')
             .replaceAll('Update Notes:', '<b><u>Update Notes:</u></b>')
-            .replaceAll('New Enhanced Animations:', '<b><u>New Enhanced Animations:</u></b>');
+            .replaceAll('New Enhanced Animations:', '<b><u>New Enhanced Animations:</u></b>')
+            .replaceAll('API Bug Fixes:', '<b><u>API Bug Fixes:</u></b>')
+            .replaceAll('API Updates', '<b><u>API Updates:</u></b>');
         let message = '<hr>Cauldron of Plentiful Resources update <b>' + info.tag_name + '</b> available!<hr>' + body;
         await ChatMessage.create({
             speaker: {alias: name},

diff --git a/scripts/lib/utilities/macroUtils.js b/scripts/lib/utilities/macroUtils.js
@@ -1,4 +1,5 @@
 import {custom} from '../../events/custom.js';
 export let macroUtils = {
-    registerMacros: custom.registerMacros
+    registerMacros: custom.registerMacros,
+    getMacro: custom.getMacro
 };