diff --git a/CHANGELOG.md b/CHANGELOG.md index 292828ae6..71e19f4f4 100644 --- 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 index 827ca4462..eb87aeef0 100644 --- 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 index 855780555..bda3c9728 100644 --- 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 index 10d4528b9..bd441ff30 100644 --- a/scripts/extensions/update.js +++ b/scripts/extensions/update.js @@ -21,7 +21,9 @@ export async function updateCheck() { .replaceAll('Updated Content:', 'Updated Content:') .replaceAll('Bug Fixes:', 'Bug Fixes:') .replaceAll('Update Notes:', 'Update Notes:') - .replaceAll('New Enhanced Animations:', 'New Enhanced Animations:'); + .replaceAll('New Enhanced Animations:', 'New Enhanced Animations:') + .replaceAll('API Bug Fixes:', 'API Bug Fixes:') + .replaceAll('API Updates', 'API Updates:'); let message = '
Cauldron of Plentiful Resources update ' + info.tag_name + ' available!
' + body; await ChatMessage.create({ speaker: {alias: name}, diff --git a/scripts/lib/utilities/macroUtils.js b/scripts/lib/utilities/macroUtils.js index 08acf80d9..92ca9e8e9 100644 --- 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 }; \ No newline at end of file