diff --git a/module/roll/chat-roll-result.mjs b/module/roll/chat-roll-result.mjs index 8ac1c26b..7898b5d1 100644 --- a/module/roll/chat-roll-result.mjs +++ b/module/roll/chat-roll-result.mjs @@ -20,7 +20,7 @@ export default class ChatRollResult { 'partial-encaissement': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-encaissement.hbs', 'partial-recul-choc': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-recul-choc.hbs', 'partial-info-appel-moral': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-info-appel-moral.hbs', - }) + }) } async display(roll) { @@ -44,7 +44,7 @@ export default class ChatRollResult { roll.show.chance = this.isAppelChancePossible(roll) roll.show.encaissement = this.isShowEncaissement(roll) roll.show.recul = this.getRecul(roll) - roll.show.particuliere = roll.show.particuliere ?? [] + //roll.show.particuliere = roll.show.particuliere ?? [] } isAppelChancePossible(roll) { @@ -54,12 +54,16 @@ export default class ChatRollResult { } isShowEncaissement(roll) { - return roll.rolled.isEchec && - roll.attackerRoll?.dmg.mortalite != 'empoignade' + switch (roll.type.current) { + case ROLL_TYPE_DEFENSE: + return roll.rolled.isEchec && + roll.attackerRoll?.dmg.mortalite != 'empoignade' + } + return false } - getRecul(roll, defender = roll.active.actor, attacker = roll.opponent.actor) { + getRecul(roll, defender = roll.active.actor, attacker = roll.opponent?.actor) { switch (roll.type.current) { case ROLL_TYPE_DEFENSE: { diff --git a/templates/roll/result/chat-attaque.hbs b/templates/roll/result/chat-attaque.hbs index 9f7fc372..ba173d6c 100644 --- a/templates/roll/result/chat-attaque.hbs +++ b/templates/roll/result/chat-attaque.hbs @@ -1,7 +1,7 @@
Qualité {{rolled.ptQualite}}, points de tâche {{rolled.ptQualite}} +
+ {{> 'partial-info-appel-moral'}} +