fix: message d'initiative sans '1d6', affiche le nom de la carte

- La formule du roll est remplacée par le nom de la carte de tarot
- Plus d'affichage de '1d6' trompeur dans le chat
- Valeur de la carte utilisée comme score d'initiative
This commit is contained in:
2026-07-10 21:01:06 +02:00
parent 2bd236fb29
commit 206abb3947
+4 -4
View File
@@ -43,7 +43,7 @@ Hooks.once("init", function () {
// Override initiative: draw a card from the tarot deck instead of rolling dice // Override initiative: draw a card from the tarot deck instead of rolling dice
Combatant.prototype.getInitiativeRoll = function (formula) { Combatant.prototype.getInitiativeRoll = function (formula) {
const data = this.actor?.getRollData() ?? {} const data = this.actor?.getRollData() ?? {}
const roll = new Roll(CONFIG.Combat.initiative.formula || "1d6", data) const roll = new Roll("1d6", data)
const origEvaluate = roll.evaluate.bind(roll) const origEvaluate = roll.evaluate.bind(roll)
roll.evaluate = async function (options = {}) { roll.evaluate = async function (options = {}) {
const deckManager = globalThis.HamalronTarotDeckManager?._instance const deckManager = globalThis.HamalronTarotDeckManager?._instance
@@ -51,10 +51,10 @@ Hooks.once("init", function () {
const drawn = deckManager.drawCards(1) const drawn = deckManager.drawCards(1)
if (drawn.length > 0) { if (drawn.length > 0) {
const card = drawn[0] const card = drawn[0]
this._total = SYSTEM.TAROT_VALEURS[card.valeur]?.value ?? 0 const val = SYSTEM.TAROT_VALEURS[card.valeur]?.value ?? 0
this._total = val
this._evaluated = true this._evaluated = true
this._dice = [] this._formula = `${card.name} (${val})`
this._terms = [{ results: [{ result: this._total }] }]
deckManager.addToDiscard(card) deckManager.addToDiscard(card)
await deckManager.saveDeckState() await deckManager.saveDeckState()
return this return this