Various initiative fixes + shield management messages

2026-04-12 01:07:58 +02:00
parent 42945d33db
commit c37d92af25
35 changed files with 589 additions and 200 deletions
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -153,7 +153,7 @@ export default class LethalFantasyActor extends Actor {
  }

  /* *************************************************/
-  async prepareRoll(rollType, rollKey, rollDice, defenderId, defenderTokenId) {
+  async prepareRoll(rollType, rollKey, rollDice, defenderId, defenderTokenId, extraShieldDr = 0) {
    console.log("Preparing roll", rollType, rollKey, rollDice, defenderId)
    let rollTarget
    switch (rollType) {
@@ -268,7 +268,7 @@ export default class LethalFantasyActor extends Actor {
    rollTarget.magicUser = this.system.biodata.magicUser
    rollTarget.actorModifiers = foundry.utils.duplicate(this.system.modifiers)
    rollTarget.actorLevel = this.system.biodata.level
-    await this.system.roll(rollType, rollTarget, defenderId, defenderTokenId)
+    await this.system.roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr)
  }

 }
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -346,58 +346,73 @@ export default class LethalFantasyRoll extends Roll {
      favor: "none",
      targetName
    }
-    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/roll-dialog.hbs", dialogContext)
+    let rollContext
+    if (options.rollContext) {
+      rollContext = foundry.utils.duplicate(options.rollContext)
+      hasGrantedDice = !!rollContext.hasGrantedDice
+      pointBlank = !!rollContext.pointBlank
+      beyondSkill = !!rollContext.beyondSkill
+      letItFly = !!rollContext.letItFly
+      saveSpell = !!rollContext.saveSpell
+      rollContext.visibility ||= rollContext.rollMode || game.settings.get("core", "rollMode")
+      rollContext.modifier ||= modifier
+      rollContext.favor ||= "none"
+      rollContext.changeDice ||= `${dice}`
+      rollContext.attackerAim ||= "0"
+    } else {
+      const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/roll-dialog.hbs", dialogContext)

-    let position = game.user.getFlag(SYSTEM.id, "roll-dialog-pos") || { top: -1, left: -1 }
-    const label = game.i18n.localize("LETHALFANTASY.Roll.roll")
-    const rollContext = await foundry.applications.api.DialogV2.wait({
-      window: { title: "Roll dialog" },
-      classes: ["lethalfantasy"],
-      content,
-      position,
-      buttons: [
-        {
-          label: label,
-          callback: (event, button, dialog) => {
-            console.log("Roll context", event, button, dialog)
-            let position = dialog.position
-            game.user.setFlag(SYSTEM.id, "roll-dialog-pos", foundry.utils.duplicate(position))
-            const output = Array.from(button.form.elements).reduce((obj, input) => {
-              if (input.name) obj[input.name] = input.value
-              return obj
-            }, {})
-            return output
+      let position = game.user.getFlag(SYSTEM.id, "roll-dialog-pos") || { top: -1, left: -1 }
+      const label = game.i18n.localize("LETHALFANTASY.Roll.roll")
+      rollContext = await foundry.applications.api.DialogV2.wait({
+        window: { title: "Roll dialog" },
+        classes: ["lethalfantasy"],
+        content,
+        position,
+        buttons: [
+          {
+            label: label,
+            callback: (event, button, dialog) => {
+              console.log("Roll context", event, button, dialog)
+              let position = dialog.position
+              game.user.setFlag(SYSTEM.id, "roll-dialog-pos", foundry.utils.duplicate(position))
+              const output = Array.from(button.form.elements).reduce((obj, input) => {
+                if (input.name) obj[input.name] = input.value
+                return obj
+              }, {})
+              return output
+            },
          },
-        },
-      ],
-      actions: {
-        "selectGranted": (event, button, dialog) => {
-          hasGrantedDice = event.target.checked
-        },
-        "selectBeyondSkill": (event, button, dialog) => {
-          beyondSkill = button.checked
-        },
-        "selectPointBlank": (event, button, dialog) => {
-          pointBlank = button.checked
-        },
-        "selectLetItFly": (event, button, dialog) => {
-          letItFly = button.checked
-        },
-        "saveSpellCheck": (event, button, dialog) => {
-          saveSpell = button.checked
-        },
-        "gotoToken": (event, button, dialog) => {
-          let tokenId = $(button).data("tokenId")
-          let token = canvas.tokens?.get(tokenId)
-          if (token) {
-            canvas.animatePan({ x: token.x, y: token.y, duration: 200 })
-            canvas.tokens.releaseAll();
-            token.control({ releaseOthers: true });
+        ],
+        actions: {
+          "selectGranted": (event, button, dialog) => {
+            hasGrantedDice = event.target.checked
+          },
+          "selectBeyondSkill": (event, button, dialog) => {
+            beyondSkill = button.checked
+          },
+          "selectPointBlank": (event, button, dialog) => {
+            pointBlank = button.checked
+          },
+          "selectLetItFly": (event, button, dialog) => {
+            letItFly = button.checked
+          },
+          "saveSpellCheck": (event, button, dialog) => {
+            saveSpell = button.checked
+          },
+          "gotoToken": (event, button, dialog) => {
+            let tokenId = $(button).data("tokenId")
+            let token = canvas.tokens?.get(tokenId)
+            if (token) {
+              canvas.animatePan({ x: token.x, y: token.y, duration: 200 })
+              canvas.tokens.releaseAll()
+              token.control({ releaseOthers: true })
+            }
          }
-        }
-      },
-      rejectClose: false // Click on Close button will not launch an error
-    })
+        },
+        rejectClose: false // Click on Close button will not launch an error
+      })
+    }

    // If the user cancels the dialog, exit
    if (rollContext === null) return
@@ -547,6 +562,10 @@ export default class LethalFantasyRoll extends Roll {
      rollFavor = null
    }

+    if (options.forceNoD30) {
+      hasD30 = false
+    }
+
    if (hasD30) {
      let rollD30 = await new Roll("1D30").evaluate()
      if (game?.dice3d) {
@@ -621,6 +640,7 @@ export default class LethalFantasyRoll extends Roll {
    rollBase.options.rollData = foundry.utils.duplicate(rollData)
    rollBase.options.defenderId = options.defenderId
    rollBase.options.defenderTokenId = options.defenderTokenId
+    rollBase.options.extraShieldDr = options.extraShieldDr || 0

    /**
     * A hook event that fires after the roll has been made.
@@ -1296,7 +1316,7 @@ export default class LethalFantasyRoll extends Roll {
   * @returns {Promise} - A promise that resolves when the message is created.
   */
  async toMessage(messageData = {}, { rollMode, create = true } = {}) {
-    super.toMessage(
+    return await super.toMessage(
      {
        isSave: this.isSave,
        isChallenge: this.isChallenge,
@@ -1313,7 +1333,7 @@ export default class LethalFantasyRoll extends Roll {
        rollData: this.rollData,
        ...messageData,
      },
-      { rollMode: rollMode },
+      { rollMode, create },
    )
  }