Empoignade V2

module/roll/chat-roll-result.mjs

@@ -5,13 +5,13 @@ import { RdDCombat } from "../rdd-combat.js"
 import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE } from "./roll-constants.mjs"
 import { RdDResolutionTable } from "../rdd-resolution-table.js"
 import { RDD_CONFIG, renderTemplate } from "../constants.js"
-import { EMPOIGNADE } from "../item/arme.js"
 import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js"
 import { RollTypeCuisine } from "./roll-type-cuisine.mjs"
 import { RollTypeMeditation } from "./roll-type-meditation.mjs"
 import { PART_DEFENSE } from "./roll-part-defense.mjs"
 import { PART_ATTAQUE } from "./roll-part-attaque.mjs"
 import { RdDRollTables } from "../rdd-rolltables.js"
+import { RdDEmpoignade } from "../rdd-empoignade.js"
 
 export default class ChatRollResult {
   static init() {
@@ -67,7 +67,7 @@ export default class ChatRollResult {
   isShowEncaissement(roll) {
     switch (roll.type.current) {
       case ROLL_TYPE_DEFENSE:
-        return roll.rolled.isEchec && roll.attackerRoll?.dmg.mortalite != EMPOIGNADE
+        return roll.rolled.isEchec
     }
     return false
   }
@@ -132,6 +132,7 @@ export default class ChatRollResult {
   async chatListeners(html) {
     $(html).on("click", '.appel-chance', event => this.onClickAppelChance(event))
     $(html).on("click", '.appel-destinee', event => this.onClickAppelDestinee(event))
+    $(html).on("click", '.button-defense', event => this.onClickDefense(event))
     $(html).on("click", '.encaissement', event => this.onClickEncaissement(event))
     $(html).on("click", '.resister-recul', event => this.onClickRecul(event))
     $(html).on("click", '.choix-particuliere', event => this.onClickChoixParticuliere(event))
@@ -219,18 +220,41 @@ export default class ChatRollResult {
     })
   }
 
-  async onClickEncaissement(event) {
+  async onClickDefense(event) {
     const chatMessage = ChatUtility.getChatMessage(event)
     const savedRoll = this.loadChatMessageRoll(chatMessage)
+    const attackerRoll = savedRoll.attackerRoll
+    this.getCombat(attackerRoll)?.defenseV2(attackerRoll,
+      [roll => { ChatUtility.removeChatMessageId(chatMessage.id) }]
+    )
+  }
+
+  async onClickEncaissement(event) {
+    const chatMessage = ChatUtility.getChatMessage(event)
+    const isMessageDemande = ChatUtility.getMessageData(chatMessage, 'demande-defense')
+    const savedRoll = this.loadChatMessageRoll(chatMessage)
     const attaque = savedRoll.attackerRoll
-    const defender = game.actors.get(savedRoll.ids.actorId)
-    const attacker = game.actors.get(savedRoll.ids.opponentId)
     const defenderToken = savedRoll.ids.actorTokenId ? canvas.tokens.get(savedRoll.ids.actorTokenId) : undefined
     const attackerToken = savedRoll.ids.opponentTokenId ? canvas.tokens.get(savedRoll.ids.opponentTokenId) : undefined
-    await defender?.encaisserDommages(attaque.dmg, attacker, undefined, attackerToken, defenderToken)
-
-    savedRoll.done.encaissement = true
-    await this.updateChatMessage(chatMessage, savedRoll)
+    switch (attaque.dmg.mortalite) {
+      case RDD_CONFIG.encaissement.empoignade:
+        savedRoll.done = savedRoll.done ?? {}
+        savedRoll.done.empoignade = await RdDEmpoignade.ajustementEmpoignade(attackerToken.actor, defenderToken.actor)
+        break
+      case RDD_CONFIG.encaissement.entiteincarnee:
+      case RDD_CONFIG.encaissement.nonmortel:
+      case RDD_CONFIG.encaissement.mortel:
+        const defender = defenderToken?.actor ?? game.actors.get(savedRoll.ids.actorId)
+        const attacker = attackerToken?.actor ?? game.actors.get(savedRoll.ids.opponentId)
+        await defender?.encaisserDommages(attaque.dmg, attacker, undefined, attackerToken, defenderToken)
+        break
+    }
+    if (isMessageDemande) {
+      ChatUtility.removeChatMessageId(chatMessage.id)
+    } else {
+      savedRoll.done.encaissement = true
+      await this.updateChatMessage(chatMessage, savedRoll)
+    }
   }
 
   async onClickRecul(event) {