${defenderName} gains +${d30Result.modifier} from D30 bonus die for defense.
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) + }) + } + } + if (d30Result.specialEffect === "auto") { + updatedDefenseRoll = attackRollFinal + 1 + await ChatMessage.create({ + content: `${defenderName} uses ${d30Result.specialName || "Special Defense"} from D30 — defense automatically succeeds!
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) }) } - - if (currentLuck > 0) { - buttons.push({ - action: "luck", - label: `Spend 1 Luck (+1D6) [${currentLuck} left]`, - icon: "fa-solid fa-clover", - callback: () => "luck" + if (d30Result.specialEffect === "flag") { + await ChatMessage.create({ + content: `D30 — ${d30Result.specialName || "Special Effect"} triggered for ${defenderName}!
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) }) } - - buttons.push({ - action: "bonusDie", - label: "Add bonus die", - icon: "fa-solid fa-dice", - callback: () => "bonusDie" - }) - - if (canShieldReact) { - buttons.push({ - action: "shieldReact", - label: `Roll shield (${shieldLabel})`, - icon: "fa-solid fa-shield", - callback: () => "shieldReact" - }) - } else if (canAdHoc) { - buttons.push({ - action: "adHocShield", - label: "Roll ad-hoc shield (choose dice + DR)", - icon: "fa-solid fa-shield-halved", - callback: () => "adHocShield" + if (d30Result.specialEffect === "drMultiplier") { + defenseDrMultiplier = d30Result.multiplier + await ChatMessage.create({ + content: `D30 — Defense grants x${d30Result.multiplier} DR (choose which DR types to multiply when damage is applied)
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) }) } + } - buttons.push({ - action: "continue", - label: "Continue (no defense bonus)", - icon: "fa-solid fa-forward", - callback: () => "continue" - }) + // Show the defense reaction dialog — while-loop for multiple reactions + if (defender) { + while (updatedDefenseRoll < attackRollFinal) { + const currentGrit = Number(defender.system?.grit?.current) || 0 + const currentLuck = Number(defender.system?.luck?.current) || 0 + const buttons = [] - const choice = await foundry.applications.api.DialogV2.wait({ - window: { title: "Defense reactions — attack boosted" }, - classes: ["lethalfantasy"], - content: ` -${attackerName} boosted attack to ${attackRollFinal}
-${defenderName} currently has ${updatedDefenseRoll}
+ if (currentGrit > 0) { + buttons.push({ + action: "grit", + label: `Spend 1 Grit (+1D6) [${currentGrit} left]`, + icon: "fa-solid fa-fist-raised", + callback: () => "grit" + }) + } + + if (currentLuck > 0) { + buttons.push({ + action: "luck", + label: `Spend 1 Luck (+1D6) [${currentLuck} left]`, + icon: "fa-solid fa-clover", + callback: () => "luck" + }) + } + + buttons.push({ + action: "bonusDie", + label: "Add bonus die", + icon: "fa-solid fa-dice", + callback: () => "bonusDie" + }) + + if (canShieldReact) { + buttons.push({ + action: "shieldReact", + label: `Roll shield (${shieldLabel})`, + icon: "fa-solid fa-shield", + callback: () => "shieldReact" + }) + } else if (canAdHoc) { + buttons.push({ + action: "adHocShield", + label: "Roll ad-hoc shield (choose dice + DR)", + icon: "fa-solid fa-shield-halved", + callback: () => "adHocShield" + }) + } + + buttons.push({ + action: "continue", + label: "Continue (no defense bonus)", + icon: "fa-solid fa-forward", + callback: () => "continue" + }) + + const choice = await foundry.applications.api.DialogV2.wait({ + window: { title: "Defense reactions — attack boosted" }, + classes: ["lethalfantasy"], + content: ` +${attackerName} boosted attack to ${attackRollFinal}
+${defenderName} currently has ${updatedDefenseRoll}
+The attack was boosted! Choose how to improve the defense.
The attack was boosted! Choose how to improve the defense.
-${defenderName} spends 1 Grit and rolls ${total} for defense.
`) - updatedDefenseRoll += bonusRoll - await defender.update({ "system.grit.current": currentGrit - 1 }) - } else if (choice === "luck") { - const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, - total => `${defenderName} spends 1 Luck and rolls ${total} for defense.
`) - updatedDefenseRoll += bonusRoll - await defender.update({ "system.luck.current": currentLuck - 1 }) - } else if (choice === "bonusDie") { - const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(defenderName, "attack", updatedDefenseRoll, attackRollFinal) - if (bonusDie) { - const bonusRoll = await LethalFantasyUtils.rollBonusDie(bonusDie, defender, - (total, formula) => `${defenderName} adds ${formula.toUpperCase()} and rolls ${total} for defense.
`) + if (!choice || choice === "continue") break + + if (choice === "grit") { + const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, + total => `${defenderName} spends 1 Grit and rolls ${total} for defense.
`) updatedDefenseRoll += bonusRoll - } - } else if (choice === "shieldReact" && canShieldReact) { - const shieldBonus = await LethalFantasyUtils.rollBonusDie(shieldFormula, defender) - const newDefenseTotal = updatedDefenseRoll + shieldBonus - updatedDefenseRoll = newDefenseTotal - canShieldReact = false - if (newDefenseTotal >= attackRollFinal) { - shieldBlocked = true - shieldReaction = { damageReduction: shieldDr, label: shieldLabel, bonus: shieldBonus } - await ChatMessage.create({ - content: `${defenderName} rolls ${shieldLabel} and adds ${shieldBonus} to defense (${newDefenseTotal} ≥ ${attackRollFinal}). Shield blocked the attack! Both armor DR and shield DR ${shieldDr} will apply to damage.
`, - speaker: ChatMessage.getSpeaker({ actor: defender }) - }) - } else { - await ChatMessage.create({ - content: `${defenderName} rolls ${shieldLabel} and adds ${shieldBonus} to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.
`, - speaker: ChatMessage.getSpeaker({ actor: defender }) - }) - } - } else if (choice === "adHocShield" && canAdHoc) { - const adHoc = await LethalFantasyUtils.promptAdHocShield(defenderName, attackRollFinal, updatedDefenseRoll) - if (adHoc) { - const shieldBonus = await LethalFantasyUtils.rollBonusDie(adHoc.formula, defender) + await defender.update({ "system.grit.current": currentGrit - 1 }) + } else if (choice === "luck") { + const bonusRoll = await LethalFantasyUtils.rollBonusDie("1d6", defender, + total => `${defenderName} spends 1 Luck and rolls ${total} for defense.
`) + updatedDefenseRoll += bonusRoll + await defender.update({ "system.luck.current": currentLuck - 1 }) + } else if (choice === "bonusDie") { + const bonusDie = await LethalFantasyUtils.promptCombatBonusDie(defenderName, "attack", updatedDefenseRoll, attackRollFinal) + if (bonusDie) { + const bonusRoll = await LethalFantasyUtils.rollBonusDie(bonusDie, defender, + (total, formula) => `${defenderName} adds ${formula.toUpperCase()} and rolls ${total} for defense.
`) + updatedDefenseRoll += bonusRoll + } + } else if (choice === "shieldReact" && canShieldReact) { + const shieldBonus = await LethalFantasyUtils.rollBonusDie(shieldFormula, defender) const newDefenseTotal = updatedDefenseRoll + shieldBonus updatedDefenseRoll = newDefenseTotal canShieldReact = false - canAdHoc = false if (newDefenseTotal >= attackRollFinal) { shieldBlocked = true - shieldReaction = { damageReduction: adHoc.damageReduction, label: `${adHoc.formula.toUpperCase()} shield`, bonus: shieldBonus } + shieldReaction = { damageReduction: shieldDr, label: shieldLabel, bonus: shieldBonus } await ChatMessage.create({ - content: `${defenderName} rolls ${adHoc.formula.toUpperCase()} shield and adds ${shieldBonus} to defense (${newDefenseTotal} ≥ ${attackRollFinal}). Shield blocked the attack! Both armor DR and shield DR ${adHoc.damageReduction} will apply to damage.
`, + content: `${defenderName} rolls ${shieldLabel} and adds ${shieldBonus} to defense (${newDefenseTotal} ≥ ${attackRollFinal}). Shield blocked the attack! Both armor DR and shield DR ${shieldDr} will apply to damage.
`, speaker: ChatMessage.getSpeaker({ actor: defender }) }) } else { await ChatMessage.create({ - content: `${defenderName} rolls ${adHoc.formula.toUpperCase()} shield and adds ${shieldBonus} to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.
`, + content: `${defenderName} rolls ${shieldLabel} and adds ${shieldBonus} to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.
`, speaker: ChatMessage.getSpeaker({ actor: defender }) }) } + } else if (choice === "adHocShield" && canAdHoc) { + const adHoc = await LethalFantasyUtils.promptAdHocShield(defenderName, attackRollFinal, updatedDefenseRoll) + if (adHoc) { + const shieldBonus = await LethalFantasyUtils.rollBonusDie(adHoc.formula, defender) + const newDefenseTotal = updatedDefenseRoll + shieldBonus + updatedDefenseRoll = newDefenseTotal + canShieldReact = false + canAdHoc = false + if (newDefenseTotal >= attackRollFinal) { + shieldBlocked = true + shieldReaction = { damageReduction: adHoc.damageReduction, label: `${adHoc.formula.toUpperCase()} shield`, bonus: shieldBonus } + await ChatMessage.create({ + content: `${defenderName} rolls ${adHoc.formula.toUpperCase()} shield and adds ${shieldBonus} to defense (${newDefenseTotal} ≥ ${attackRollFinal}). Shield blocked the attack! Both armor DR and shield DR ${adHoc.damageReduction} will apply to damage.
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) + }) + } else { + await ChatMessage.create({ + content: `${defenderName} rolls ${adHoc.formula.toUpperCase()} shield and adds ${shieldBonus} to defense (${newDefenseTotal} < ${attackRollFinal}). Shield did not block — normal hit, armor DR only.
`, + speaker: ChatMessage.getSpeaker({ actor: defender }) + }) + } + } } } } const finalShieldDR = shieldBlocked ? (shieldReaction?.damageReduction || 0) : 0 - const outcome = shieldBlocked ? "shielded-hit" : (updatedDefenseRoll > attackRollFinal ? "miss" : "hit") + const outcome = shieldBlocked ? "shielded-hit" : (updatedDefenseRoll >= attackRollFinal ? "miss" : "hit") await LethalFantasyUtils.compareAttackDefense({ attackerName, @@ -399,7 +438,7 @@ export default class LethalFantasyUtils { shieldDamageReduction: finalShieldDR, d30Bleed: d30Bleed || "", d30DamageMultiplier: d30DamageMultiplier || 1, - d30DrMultiplier: d30DrMultiplier || 1, + d30DrMultiplier: (d30DrMultiplier != null && d30DrMultiplier !== 1) ? d30DrMultiplier : (defenseDrMultiplier ?? d30DrMultiplier ?? 1), damageTier: damageTier || "standard", attackD30message }) @@ -742,18 +781,11 @@ export default class LethalFantasyUtils { // ── Choice type ── present all options to the player if (d30Message.type === "choice") { - // Try to find a bonus_dice option matching this side - const autoBonus = d30Message.choices.find(c => c.type === "bonus_dice" && validTargets.includes(c.target)) - - // If we can't show dialogs (wrong client), auto-roll bonus dice if available + // If we can't show dialogs (wrong client), skip — the primary client + // will communicate its choice result via socket. Auto-rolling here + // would give a different modifier on each client, causing divergence. if (!canDialog) { - if (autoBonus) { - const modifier = await this._rollD30BonusDie(autoBonus.dice, actor, true) - return { modifier, specialEffect: null, specialName: null } - } - // No bonus dice available on this side — just report as flag - const first = d30Message.choices[0] - return { modifier: 0, specialEffect: "flag", specialName: first?.type || "choice" } + return { modifier: 0, specialEffect: null, specialName: null } } const buttons = d30Message.choices.map(c => { diff --git a/templates/weapon.hbs b/templates/weapon.hbs index 57e48dd..7f2375e 100644 --- a/templates/weapon.hbs +++ b/templates/weapon.hbs @@ -17,7 +17,7 @@ {{formField systemFields.damageType.fields.typeS value=system.damageType.typeS}}