From 5601e0a0b2a1525d3833c452be694610e7456cdc Mon Sep 17 00:00:00 2001 From: Gambit Date: Wed, 28 Aug 2024 14:33:12 -0400 Subject: [PATCH] 0.5.34 --- .github/workflows/main.yml | 3 ++- scripts/macros/opportunityAttack.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31ed3c4..ecced91 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,8 @@ jobs: - name: Set Release Notes for Github id: set-release-notes-github run: | - echo "- General: Prevent wrapping scenes with Hexagonal grids for region testing. This means hexagonal grids will use foundrys default token center point testing for regions" >> release_notes.txt + echo "- Bugfixes:" >> release_notes.txt + echo " - Opportunity Attack: Fix issue causing the automation to exit before checking Polearm Master validity, which subsequently caused valid Polearm Master reactions to not fire." >> release_notes.txt echo "release-notes-github<> $GITHUB_ENV cat release_notes.txt >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV diff --git a/scripts/macros/opportunityAttack.js b/scripts/macros/opportunityAttack.js index 78fa913..9e3c53e 100644 --- a/scripts/macros/opportunityAttack.js +++ b/scripts/macros/opportunityAttack.js @@ -82,11 +82,11 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS regionTokenStates.delete(`${region.id}-${token.id}-exited`); regionTokenStates.delete(`${region.id}-${token.id}-entered`); - if (token.regions.has(region)) return; //if(hasSentinel && (sentinelUsed || sentinelDeclined)) return; if((exited || (!exited && !entered)) && !isTeleport) { + if (token.regions.has(region)) return; const effectNamesToken = ["Dissonant Whispers"]; let hasEffectToken = token.actor.appliedEffects.some(effect => effectNamesToken.includes(effect.name)); if (currentCombatant.id !== token.id && !hasEffectToken) return;