uberwald/fvtt-mournblade-cyd-2-0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Derniers fix de sécurité et assimilé

Browse Source
This commit is contained in:
LeRatierBretonnier
2026-04-04 09:40:30 +02:00
parent 1fb80f6abe
commit 56b58565d1
5 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/mournblade-cyd2-utility.js
View File

@@ -229,15 +229,6 @@ export class MournbladeCYD2Utility {
return undefined;
}
/* -------------------------------------------- */
static createDirectOptionList(min, max) {
let options = {};
for (let i = min; i <= max; i++) {
options[`${i}`] = `${i}`;
}
return options;
}
/* -------------------------------------------- */
static buildListOptions(min, max) {
let options = ""
@@ -279,13 +270,13 @@ export class MournbladeCYD2Utility {
}
/* -------------------------------------------- */
static onSocketMesssage(msg) {
static onSocketMessage(msg) {
if (msg.msg == "msg_apply_combativite") {
let defender = game.canvas.tokens.get(msg.data.defenderTokenId)?.actor
if (defender) {
defender.changeEtatCombativite(msg.data.value)
} else {
console.warn("MournbladeCYD2Utility.onSocketMesssage : Impossible de trouver le token pour appliquer la combativité", msg.defenderTokenId)
console.warn("MournbladeCYD2Utility.onSocketMessage : Impossible de trouver le token pour appliquer la combativité", msg.defenderTokenId)
}
}
}
@@ -347,9 +338,9 @@ export class MournbladeCYD2Utility {
/* -------------------------------------------- */
static computeResult(rollData) {
rollData.diceResult = rollData.roll.terms[0].results[0].result
rollData.diceResult = rollData.roll?.terms?.[0]?.results?.[0]?.result ?? 0
if (rollData.mainDice.includes("d20")) {
let diceValue = rollData.roll.terms[0].results[0].result
let diceValue = rollData.roll?.terms?.[0]?.results?.[0]?.result ?? 0
if (diceValue % 2 == 1) {
rollData.isD20Impair = true
rollData.finalResult -= rollData.roll.terms[0].results[0].result // Substract value
@@ -376,7 +367,12 @@ export class MournbladeCYD2Utility {
/* -------------------------------------------- */
static applyCombativite(rollData, value) {
if (game.user.isGM) {
let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
const token = game.canvas.tokens.get(rollData.defenderTokenId)
const defender = token?.actor
if (!defender) {
console.warn("MournbladeCYD2Utility.applyCombativite : token défenseur introuvable", rollData.defenderTokenId)
return
}
defender.changeEtatCombativite(value)
} else {
game.socket.emit("system.fvtt-mournblade-cyd-2-0", { msg: "msg_apply_combativite", data: { defenderTokenId: rollData.defenderTokenId, value } });
@@ -533,8 +529,11 @@ export class MournbladeCYD2Utility {
this.applyCombativite(rollData, rollData.nbCombativitePerdu)
}
if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) {
let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
defender.incDecAdversite("bleue", -2)
const token = game.canvas.tokens.get(rollData.defenderTokenId)
const defender = token?.actor
if (defender) {
defender.incDecAdversite("bleue", -2)
}
}
}
@@ -620,7 +619,7 @@ export class MournbladeCYD2Utility {
rollData.bonusFormula = rollData.addedBonus
console.log("Bonus Roll MournbladeCYD2", rollData.bonusFormula)
if (!Number(rollData.bonusFormula)) {
if (isNaN(Number(rollData.bonusFormula))) {
let bonusRoll = await new Roll(rollData.bonusFormula).roll()
await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
rollData.bonusRoll = foundry.utils.duplicate(bonusRoll)