uberwald/fvtt-lethal-fantasy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 51 Wiki Activity

Various fixes for spell and ranged attacks

Browse Source
This commit is contained in:
LeRatierBretonnier
2026-05-23 00:11:58 +02:00
parent e417b61625
commit 2770774aa3
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/documents/d30-roll.mjs
+4 -5
View File
@@ -111,17 +111,16 @@ export default class D30Roll {
if (externalType === "weapon-attack") {
if (!weapon) {
console.warn("D30Roll | Weapon object required for weapon-attack type")
return this.ROLL_TYPES.MELEE_ATTACK // Default to melee
// Fall through to use options.isRanged if available, otherwise default melee
}
return weapon.system?.weaponType === "ranged"
return (options.isRanged || weapon?.system?.weaponType === "ranged")
? this.ROLL_TYPES.RANGED_ATTACK
: this.ROLL_TYPES.MELEE_ATTACK
}
// Monster attacks - default to melee
// Monster attacks - check options.isRanged (set from rollTarget.attackMode) or weapon type
if (externalType === "monster-attack") {
// Check if weapon object has range information
if (weapon?.system?.weaponType === "ranged") {
if (options.isRanged || weapon?.system?.weaponType === "ranged") {
return this.ROLL_TYPES.RANGED_ATTACK
}
return this.ROLL_TYPES.MELEE_ATTACK