diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 5ef5b77d..5108c363 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -698,6 +698,7 @@ export class RdDCombat { else { const defenderToken = canvas.tokens.get(this.defenderTokenId); const dist = this.distance(_token, defenderToken) + const isVisible = this.isVisible(_token, defenderToken) const portee = this._ajustementPortee(dist, rollData.arme) const taille = this._ajustementTaille(this.defender) const activite = this._ajustementMouvement(this.defender) @@ -706,6 +707,7 @@ export class RdDCombat { content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-info-distance.html', { rollData: rollData, attacker: _token, + isVisible: isVisible, defender: defenderToken, distance: dist, portee: portee, @@ -719,6 +721,10 @@ export class RdDCombat { } } + isVisible(token, defender) { + return canvas.effects.visibility.testVisibility(defender.center, { object: token }) + } + distance(t, defenderToken) { return Number(canvas.grid.measureDistances([{ ray: new Ray(t.center, defenderToken.center) }], { gridSpaces: false })).toFixed(1); } diff --git a/system.json b/system.json index 17b93db6..2257fe1a 100644 --- a/system.json +++ b/system.json @@ -34,10 +34,10 @@ ], "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/", "license": "LICENSE.txt", - "version": "10.0.25", + "version": "10.0.26", "compatibility": { "minimum": "10", - "verified": "10.286" + "verified": "10.287" }, "esmodules": [ "module/rdd-main.js" @@ -333,7 +333,7 @@ ], "socket": true, "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.25.zip", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.26.zip", "gridDistance": 1, "gridUnits": "m", "primaryTokenAttribute": "sante.vie", diff --git a/templates/chat-info-distance.html b/templates/chat-info-distance.html index 8cc89e5b..a1702673 100644 --- a/templates/chat-info-distance.html +++ b/templates/chat-info-distance.html @@ -2,6 +2,11 @@ Ajustement de tir/lancer proposé de {{total}}