Add melee/ranged and damage type to elemental blast roll options (fou…

…ndryvtt#11627)
CarlosFdez · Nov 20, 2023 · 745c376 · 745c376
1 parent 8442e3c
commit 745c376
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/module/actor/character/elemental-blast.ts b/src/module/actor/character/elemental-blast.ts
@@ -347,7 +347,12 @@ class ElementalBlast {
             melee,
             damaging: true,
             dc: { slug: "ac" },
-            extraRollOptions: [`action:${actionSlug}`, `action:cost:${actionCost}`],
+            extraRollOptions: [
+                `action:${actionSlug}`,
+                `action:cost:${actionCost}`,
+                meleeOrRanged,
+                `item:${meleeOrRanged}`,
+            ],
             ...eventToRollParams(params.event, { type: "check" }),
         });
     }
@@ -384,7 +389,14 @@ class ElementalBlast {
             outcome,
             melee,
             checkContext: params.checkContext,
-            options: new Set([`action:${actionSlug}`, `action:cost:${actionCost}`, meleeOrRanged, ...item.traits]),
+            options: new Set([
+                `action:${actionSlug}`,
+                `action:cost:${actionCost}`,
+                meleeOrRanged,
+                `item:${meleeOrRanged}`,
+                `item:damage:type:${params.damageType}`,
+                ...item.traits,
+            ]),
         });
 
         const baseDamage: BaseDamageData = {