0.5.69

gambit07 · Oct 28, 2024 · f761082 · f761082
1 parent 304d5f1
commit f761082
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,10 +18,8 @@ jobs:
       - name: Set Release Notes for Github
         id: set-release-notes-github
         run: |
-          echo "- Additions:" >> release_notes.txt
-          echo "  - Cloak of Displacement: Automates the Cloak of Displacement item. Includes medkit configurable animation." >> release_notes.txt
-          echo "- Updates:" >> release_notes.txt
-          echo "  - Confusion: Added configurable medkit animation. Couple small bugfixes" >> release_notes.txt
+          echo "- General:" >> release_notes.txt
+          echo "  - Region Wrapping: Disable wrapping for the Opportunity Attack automation if using a gridded scene." >> release_notes.txt
           echo "release-notes-github<<EOF" >> $GITHUB_ENV
           cat release_notes.txt >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV

diff --git a/scripts/module.js b/scripts/module.js
@@ -39,7 +39,8 @@ Hooks.once('init', async function() {
             const [region, position] = args;
 
             if(region?.document.flags["gambits-premades"]?.excludeRegionHandling) return wrapped(...args); //GPS boolean flag to exclude region wrapping
-            if (canvas.scene.grid.type >= 2) return wrapped(...args); //Don't wrap hex grid types for now
+            if(canvas.scene.grid.type >= 2) return wrapped(...args); //Don't wrap hex grid types for now
+            if(canvas.scene.grid.type === 1 && region?.document.flags["gambits-premades"]?.opportunityAttackSet === true) return wrapped(...args); //Don't wrap OA regions on gridded
             if (!this || !this.document) return wrapped(...args);
 
             const pointsToTest = [];
@@ -78,8 +79,9 @@ Hooks.once('init', async function() {
             const [region, waypoints, options] = args;
 
             if(region?.document.flags["gambits-premades"]?.excludeRegionHandling) return wrapped(...args); //GPS boolean flag to exclude region wrapping
-            if (canvas.scene.grid.type >= 2) return wrapped(...args); //Don't wrap hex grid types for now
-            if (!this || !this.document) return wrapped(...args);
+            if(canvas.scene.grid.type >= 2) return wrapped(...args); //Don't wrap hex grid types for now
+            if(canvas.scene.grid.type === 1 && region?.document.flags["gambits-premades"]?.opportunityAttackSet === true) return wrapped(...args); //Don't wrap OA regions on gridded
+            if(!this || !this.document) return wrapped(...args);
 
             const pointsToTest = [];
             const size = canvas.dimensions.size;