0.0.96

gambit07 · Mar 9, 2024 · 37c663d · 37c663d
1 parent 2e09506
commit 37c663d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
         id: set-release-notes-github
         run: |
           echo "- Bugfixes:" >> release_notes.txt
-          echo "  - Silvery Barbs: Add additional checks to prevent ally on ally violence." >> release_notes.txt
+          echo "  - Silvery Barbs: Fix attack rolls of allies triggering silvery barbs. Updated Effect icon to use the Silvery Barbs item icon" >> release_notes.txt
           echo "release-notes-github<<EOF" >> $GITHUB_ENV
           cat release_notes.txt >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV

diff --git a/module.json b/module.json
@@ -7,7 +7,7 @@
 		"name": "Gambit"
 		}
 	],
-  "version": "0.0.95",
+  "version": "0.0.96",
 	"compatibility": {
 	"minimum": "11",
 	"verified": "11",

diff --git a/scripts/macros/silveryBarbs.js b/scripts/macros/silveryBarbs.js
@@ -6,6 +6,7 @@ export async function silveryBarbs({workflowData,workflowType}) {
     const workflowUuid = workflowData;
     const workflow = await MidiQOL.Workflow.getWorkflow(workflowUuid);
     if(!workflow) return;
+    console.log(workflow)
     if(workflow.item.name.toLowerCase() === "silvery barbs") return;
 
     if (!game.combat) return;
@@ -103,7 +104,7 @@ export async function silveryBarbs({workflowData,workflowType}) {
             let targetUuids = Array.from(workflow.saves)
             .filter(token => token.document.disposition !== validTokenPrimary.document.disposition)
             .map(token => token.actor.uuid);
-            if(!targetUuids) return;
+            if(targetUuids.length === 0) return;
             let targetNames = Array.from(workflow.saves)
             .filter(token => token.document.disposition !== validTokenPrimary.document.disposition)
             .map(token => token.actor.name);
@@ -307,6 +308,7 @@ export async function showSilveryBarbsDialog(tokenUuids, actorUuid, tokenUuid, d
                         }
 
                         let chosenSpell = actor.items.find(i => i.name.toLowerCase() === "silvery barbs");
+                        console.log(chosenSpell)
 
                         chosenSpell.prepareData();
                         chosenSpell.prepareFinalAttributes();
@@ -334,7 +336,7 @@ export async function showSilveryBarbsDialog(tokenUuids, actorUuid, tokenUuid, d
 
                         let effectData = [
                             {
-                              "icon": "icons/magic/control/control-influence-puppet.webp",
+                              "icon": `${chosenSpell.img}`,
                               "duration": {
                                 "rounds": null,
                                 "startTime": null,