From 745c376ae58d2a1aeade01ab6f52a46d1a8893ec Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Date: Mon, 20 Nov 2023 15:21:26 -0500
Subject: [PATCH] Add melee/ranged and damage type to elemental blast roll
 options (#11627)

---
 src/module/actor/character/elemental-blast.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/module/actor/character/elemental-blast.ts b/src/module/actor/character/elemental-blast.ts
index 11be946bc78..076e2339ed2 100644
--- 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 = {