feat: D30 combat effects, spell tiers, small damage removal, token HUD luck/grit
- Replace Knockback with Internal Injury on D30 (5, 10, 15); remove Shield Bash from D30 counter-attacks - Eliminate small weapon damage: keep only medium damage labelled Damage in sheets, rolls, and chat - D30 bonus dice (20, 27, 30) auto-resolved before grit/luck/shield decisions; choice dialogs for special strikes - D30 combat effects: bleeding wounds, damage ×2/×3 before DR, DR ×2/×3 with component picker dialog - Add hp.wounds to monster schema for bleeding support - Show Save against spell? checkbox for all save rolls (not just magic users) - Fix mulligan restart: persistent D30 process flags prevent double-application and allow both sides to react - For Dice So Nice, show main roll animation before explosion dice for correct ordering - Spell tier selection: force Standard/Overpowered choice at cast time, tier-specific aether cost, only chosen damage button shown - Add +1/−1 luck and grit controls to Token HUD - Fix inconsistent indentation, remove duplicate i18n key, remove unused includesShield return
This commit is contained in:
+233
-20
@@ -242,6 +242,9 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
console.log(`[LF] request-defense-btn | attackRollType=${attackRollType} defender=${defenderName} defenderType=${combatant.actor?.type}`)
|
||||
const attackD30result = message.rolls[0]?.options?.D30result || null
|
||||
const attackD30message = message.rolls[0]?.options?.D30message || null
|
||||
const attackDiceResults = message.rolls[0]?.options?.diceResults || null
|
||||
const attackNaturalRoll = attackDiceResults?.[0]?.value || null
|
||||
const damageTier = message.rolls[0]?.options?.damageTier || "standard"
|
||||
const attackRerollContext = {
|
||||
rollType: message.rolls[0]?.options?.rollType,
|
||||
rollTarget: foundry.utils.duplicate(message.rolls[0]?.options?.rollTarget ?? {}),
|
||||
@@ -277,6 +280,8 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
attackD30result,
|
||||
attackD30message,
|
||||
attackRerollContext,
|
||||
attackNaturalRoll,
|
||||
damageTier,
|
||||
combatantId,
|
||||
tokenId,
|
||||
isRanged: isRangedAttack
|
||||
@@ -338,6 +343,9 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
const damageFormula = btn.dataset.damageFormula
|
||||
const damageModifier = btn.dataset.damageModifier
|
||||
const isMonster = btn.dataset.isMonster
|
||||
const d30Bleed = btn.dataset.d30Bleed === "true"
|
||||
const d30DamageMultiplier = Number(btn.dataset.d30DamageMult) || 1
|
||||
const d30DrMultiplier = Number(btn.dataset.d30DrMult) || 1
|
||||
|
||||
// Récupérer l'acteur (soit depuis le message, soit depuis attackerId)
|
||||
const actor = attackerId ? game.actors.get(attackerId) : game.actors.get(message.rolls[0]?.actorId)
|
||||
@@ -392,7 +400,10 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
defenderTokenId,
|
||||
actorId: actor.id,
|
||||
actorName: actor.name,
|
||||
actorImage: actor.img
|
||||
actorImage: actor.img,
|
||||
d30Bleed,
|
||||
d30DamageMultiplier,
|
||||
d30DrMultiplier
|
||||
}
|
||||
await documents.LethalFantasyRoll.rollSpellDamageToMessage(damageFormula, rollOpts)
|
||||
return
|
||||
@@ -400,13 +411,13 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
|
||||
// Pour les boutons de résultat de combat (monster damage)
|
||||
if (damageType === "monster" && attackKey) {
|
||||
await actor.system.prepareMonsterRoll("monster-damage", attackKey, undefined, undefined, undefined, defenderId, defenderTokenId, extraShieldDr)
|
||||
await actor.system.prepareMonsterRoll("monster-damage", attackKey, undefined, undefined, undefined, defenderId, defenderTokenId, extraShieldDr, { d30Bleed, d30DamageMultiplier, d30DrMultiplier })
|
||||
return
|
||||
}
|
||||
|
||||
// Pour les monstres, utiliser prepareMonsterRoll
|
||||
if (isMonster === "true" || actor.type === "monster") {
|
||||
await actor.system.prepareMonsterRoll("monster-damage", weaponId, undefined, undefined, damageModifier)
|
||||
await actor.system.prepareMonsterRoll("monster-damage", weaponId, undefined, undefined, damageModifier, defenderId, defenderTokenId, extraShieldDr, { d30Bleed, d30DamageMultiplier, d30DrMultiplier })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -417,9 +428,9 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
|
||||
return
|
||||
}
|
||||
|
||||
// Lancer les dégâts avec la bonne méthode
|
||||
const rollType = damageType === "small" ? "weapon-damage-small" : "weapon-damage-medium"
|
||||
await actor.prepareRoll(rollType, weaponId, undefined, defenderId, defenderTokenId, extraShieldDr)
|
||||
// Lancer les dégâts
|
||||
const rollType = "weapon-damage"
|
||||
await actor.prepareRoll(rollType, weaponId, undefined, defenderId, defenderTokenId, extraShieldDr, { d30Bleed, d30DamageMultiplier, d30DrMultiplier })
|
||||
})
|
||||
}
|
||||
|
||||
@@ -483,6 +494,8 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
attackRollKey,
|
||||
attackD30message,
|
||||
attackRerollContext,
|
||||
attackNaturalRoll,
|
||||
damageTier,
|
||||
defenderId,
|
||||
defenderTokenId
|
||||
} = attackData
|
||||
@@ -542,12 +555,50 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
let attackRollFinal = attackRoll
|
||||
let canRerollAttack = LethalFantasyUtils.hasD30Reroll(attackD30message)
|
||||
let mulliganRestart = false
|
||||
// These persist across mulligan restarts (D30 bonus only applied once)
|
||||
let defenseD30Processed = false
|
||||
let attackD30Processed = false
|
||||
// D30 combat effects for damage application
|
||||
let d30Bleed = false
|
||||
let d30DamageMultiplier = 1
|
||||
let d30DrMultiplier = 1
|
||||
|
||||
do {
|
||||
mulliganRestart = false
|
||||
defenderHandledBonus = false
|
||||
attackerHandledBonus = false
|
||||
|
||||
// ── D30 bonus dice (defense) — resolved before grit/luck/shield ───────
|
||||
if (defenseD30message && !defenseD30Processed && isPrimaryController(defender)) {
|
||||
const d30Result = await LethalFantasyUtils.processD30BonusDice(defenseD30message, "defense", null, defender)
|
||||
if (d30Result.modifier) {
|
||||
defenseRoll += d30Result.modifier
|
||||
if (d30Result.modifier > 0) {
|
||||
await createReactionMessage(defender,
|
||||
`<p><strong>${defenderName}</strong> gains <strong>+${d30Result.modifier}</strong> from D30 bonus die for defense.</p>`
|
||||
)
|
||||
}
|
||||
}
|
||||
if (d30Result.specialEffect === "auto") {
|
||||
defenseRoll = attackRollFinal + 1 // auto-block
|
||||
await createReactionMessage(defender,
|
||||
`<p><strong>${defenderName}</strong> uses <strong>${d30Result.specialName || "Special Defense"}</strong> from D30 — defense automatically succeeds!</p>`
|
||||
)
|
||||
}
|
||||
if (d30Result.specialEffect === "flag") {
|
||||
await createReactionMessage(defender,
|
||||
`<p>D30 — <strong>${d30Result.specialName || "Special Effect"}</strong> triggered for ${defenderName}!</p>`
|
||||
)
|
||||
}
|
||||
if (d30Result.specialEffect === "drMultiplier") {
|
||||
d30DrMultiplier = d30Result.multiplier
|
||||
await createReactionMessage(defender,
|
||||
`<p>D30 — Defense grants <strong>x${d30Result.multiplier} DR</strong> (choose which DR types to multiply when damage is applied)</p>`
|
||||
)
|
||||
}
|
||||
defenseD30Processed = true
|
||||
}
|
||||
|
||||
// ── Defense reaction loop ──────────────────────────────────────────────
|
||||
if (defender && defenseRoll < attackRollFinal && isPrimaryController(defender) && !isSpellOrMiracle) {
|
||||
while (defenseRoll < attackRollFinal) {
|
||||
@@ -726,6 +777,43 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
|
||||
if (mulliganRestart) continue
|
||||
|
||||
// ── D30 bonus dice (attack) — resolved before grit/luck ────────────────
|
||||
if (attackD30message && !attackD30Processed && isPrimaryController(attacker)) {
|
||||
const d30Result = await LethalFantasyUtils.processD30BonusDice(attackD30message, "attack", attackNaturalRoll, attacker)
|
||||
if (d30Result.modifier) {
|
||||
attackRollFinal += d30Result.modifier
|
||||
if (d30Result.modifier > 0) {
|
||||
await createReactionMessage(attacker,
|
||||
`<p><strong>${attackerName}</strong> gains <strong>+${d30Result.modifier}</strong> from D30 bonus die for attack.</p>`
|
||||
)
|
||||
}
|
||||
}
|
||||
if (d30Result.specialEffect === "auto") {
|
||||
attackRollFinal = defenseRoll + 1 // auto-hit
|
||||
await createReactionMessage(attacker,
|
||||
`<p><strong>${attackerName}</strong> uses <strong>${d30Result.specialName || "Special Strike"}</strong> from D30 — attack automatically hits!</p>`
|
||||
)
|
||||
}
|
||||
if (d30Result.specialEffect === "flag") {
|
||||
await createReactionMessage(attacker,
|
||||
`<p>D30 — <strong>${d30Result.specialName || "Special Effect"}</strong> triggered for ${attackerName}!</p>`
|
||||
)
|
||||
}
|
||||
if (d30Result.specialEffect === "bleed") {
|
||||
d30Bleed = true
|
||||
await createReactionMessage(attacker,
|
||||
`<p>D30 — <strong>Bleeding/Internal Injury</strong> on hit! Damage past DR will cause a bleeding wound.</p>`
|
||||
)
|
||||
}
|
||||
if (d30Result.specialEffect === "damageMultiplier") {
|
||||
d30DamageMultiplier = d30Result.multiplier
|
||||
await createReactionMessage(attacker,
|
||||
`<p>D30 — <strong>x${d30Result.multiplier} damage</strong> before damage reduction!</p>`
|
||||
)
|
||||
}
|
||||
attackD30Processed = true
|
||||
}
|
||||
|
||||
// ── Attack reaction loop ───────────────────────────────────────────────
|
||||
if (!defenderHandledBonus && attacker && attackRollFinal <= defenseRoll && isPrimaryController(attacker)) {
|
||||
while (attackRollFinal <= defenseRoll) {
|
||||
@@ -837,7 +925,11 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
defenderTokenId,
|
||||
defenseRoll,
|
||||
outcome,
|
||||
shieldDamageReduction
|
||||
shieldDamageReduction,
|
||||
d30Bleed: d30Bleed ? "true" : "",
|
||||
d30DamageMultiplier: d30DamageMultiplier,
|
||||
d30DrMultiplier: d30DrMultiplier,
|
||||
damageTier: damageTier || "standard"
|
||||
})
|
||||
} else {
|
||||
console.log("Skipping message creation", { attackerHandledBonus, defenderHandledBonus })
|
||||
@@ -865,15 +957,19 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
const spell = spellId ? actor.items.get(spellId) : null
|
||||
if (!spell || spell.type !== "spell") return
|
||||
|
||||
const cost = Number(spell.system?.cost) || 0
|
||||
const damageTier = message.rolls[0]?.options?.damageTier || "standard"
|
||||
const tierCostMap = { standard: "cost", overpowered: "costOverpowered", overpowered2: "costOverpowered2" }
|
||||
const costField = tierCostMap[damageTier] || "cost"
|
||||
const cost = Number(spell.system?.[costField]) || 0
|
||||
if (cost <= 0) return
|
||||
|
||||
const currentAether = Number(actor.system.aetherPoints?.value) || 0
|
||||
const newAether = Math.max(0, currentAether - cost)
|
||||
await actor.update({ "system.aetherPoints.value": newAether })
|
||||
|
||||
const tierLabel = damageTier === "standard" ? "" : ` (${damageTier})`
|
||||
await ChatMessage.create({
|
||||
content: `<p>🔮 <strong>${actor.name}</strong> casts <em>${spell.name}</em> — spends <strong>${cost}</strong> Aether <span style="color:#888;">(${currentAether} → ${newAether})</span>.</p>`,
|
||||
content: `<p>🔮 <strong>${actor.name}</strong> casts <em>${spell.name}${tierLabel}</em> — spends <strong>${cost}</strong> Aether <span style="color:#888;">(${currentAether} → ${newAether})</span>.</p>`,
|
||||
speaker: ChatMessage.getSpeaker({ actor })
|
||||
})
|
||||
})
|
||||
@@ -966,13 +1062,94 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
const attackerName = message.rolls[0]?.options?.actorName || "Unknown Attacker"
|
||||
const rollType = message.rolls[0]?.options?.rollType
|
||||
|
||||
// Lire les effets D30
|
||||
const d30Bleed = message.rolls[0]?.options?.d30Bleed || false
|
||||
const d30DamageMultiplier = message.rolls[0]?.options?.d30DamageMultiplier || 1
|
||||
const d30DrMultiplier = message.rolls[0]?.options?.d30DrMultiplier || 1
|
||||
|
||||
// Appliquer le multiplicateur de dégâts D30 au total AVANT DR
|
||||
const rawDamage = damageTotal * d30DamageMultiplier
|
||||
|
||||
// Calculer les DR — les sorts utilisent une DR manuelle saisie par l'utilisateur
|
||||
const isSpellDamage = rollType === "spell-damage"
|
||||
const manualDR = message.rolls[0]?.options?.manualDR ?? 0
|
||||
const extraShieldDr = Number(message.rolls[0]?.options?.extraShieldDr) || 0
|
||||
const armorDR = isSpellDamage ? manualDR : (defender.computeDamageReduction() || 0)
|
||||
const totalDR = isSpellDamage ? manualDR : armorDR + extraShieldDr
|
||||
const finalDamage = Math.max(0, damageTotal - totalDR)
|
||||
|
||||
// Décomposer les DR en composants
|
||||
let baseDR = 0
|
||||
let shieldDR = 0
|
||||
let magicDR = 0
|
||||
|
||||
if (isSpellDamage) {
|
||||
baseDR = manualDR
|
||||
} else {
|
||||
const totalDefDR = defender.computeDamageReduction() || 0
|
||||
magicDR = defender.getMagicDR() || 0
|
||||
baseDR = totalDefDR - magicDR // naturalDR + armorDR (ou hpDR + combatDR pour les monstres)
|
||||
shieldDR = extraShieldDr
|
||||
}
|
||||
|
||||
// Appliquer le multiplicateur de DR D30 si actif — boîte de dialogue
|
||||
let appliedBaseDR = baseDR
|
||||
let appliedShieldDR = shieldDR
|
||||
let appliedMagicDR = magicDR
|
||||
|
||||
if (d30DrMultiplier > 1) {
|
||||
const drResult = await (async () => {
|
||||
const checks = {
|
||||
base: true,
|
||||
shield: shieldDR > 0,
|
||||
magic: magicDR > 0
|
||||
}
|
||||
const html = `
|
||||
<div class="grit-luck-dialog">
|
||||
<p><strong>D30 DR Multiplier ×${d30DrMultiplier}</strong></p>
|
||||
<p>Choose which DR types to multiply:</p>
|
||||
<label style="display:block;margin:0.3rem 0">
|
||||
<input type="checkbox" id="d30-dr-base" ${checks.base ? "checked" : ""} ${baseDR <= 0 ? "disabled" : ""}>
|
||||
Base DR (Armor/Natural): ${baseDR} → ×${d30DrMultiplier} = ${baseDR * d30DrMultiplier}
|
||||
</label>
|
||||
<label style="display:block;margin:0.3rem 0">
|
||||
<input type="checkbox" id="d30-dr-shield" ${checks.shield ? "checked" : ""} ${shieldDR <= 0 ? "disabled" : ""}>
|
||||
Shield DR: ${shieldDR} → ×${d30DrMultiplier} = ${shieldDR * d30DrMultiplier}
|
||||
</label>
|
||||
<label style="display:block;margin:0.3rem 0">
|
||||
<input type="checkbox" id="d30-dr-magic" ${checks.magic ? "checked" : ""} ${magicDR <= 0 ? "disabled" : ""}>
|
||||
Magic DR: ${magicDR} → ×${d30DrMultiplier} = ${magicDR * d30DrMultiplier}
|
||||
</label>
|
||||
</div>
|
||||
`
|
||||
const result = await foundry.applications.api.DialogV2.wait({
|
||||
window: { title: "Apply D30 DR Multiplier" },
|
||||
classes: ["lethalfantasy"],
|
||||
content: html,
|
||||
buttons: [
|
||||
{
|
||||
action: "apply",
|
||||
label: "Apply Damage",
|
||||
icon: "fa-solid fa-check",
|
||||
callback: (event, button) => {
|
||||
const form = button.form || button.closest("form")
|
||||
return {
|
||||
applyBase: form.querySelector("#d30-dr-base")?.checked || false,
|
||||
applyShield: form.querySelector("#d30-dr-shield")?.checked || false,
|
||||
applyMagic: form.querySelector("#d30-dr-magic")?.checked || false
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
rejectClose: false
|
||||
})
|
||||
return result || { applyBase: false, applyShield: false, applyMagic: false }
|
||||
})()
|
||||
|
||||
appliedBaseDR = drResult.applyBase ? baseDR * d30DrMultiplier : baseDR
|
||||
appliedShieldDR = drResult.applyShield ? shieldDR * d30DrMultiplier : shieldDR
|
||||
appliedMagicDR = drResult.applyMagic ? magicDR * d30DrMultiplier : magicDR
|
||||
}
|
||||
|
||||
const totalDR = appliedBaseDR + appliedShieldDR + appliedMagicDR
|
||||
const finalDamage = Math.max(0, rawDamage - totalDR)
|
||||
|
||||
// Prefer the token ID stored in roll options (set at attack time when the exact token is known).
|
||||
// For unlinked tokens (default for monsters), this ensures we target the right instance even
|
||||
@@ -987,34 +1164,70 @@ Hooks.on("createChatMessage", async (message) => {
|
||||
// Apply damage. If the current user does not own the defender (e.g. player hitting a GM monster),
|
||||
// route the HP update to the GM via socket. The confirmation message is still created here
|
||||
// since all users can create chat messages.
|
||||
const applyDamageToActor = async (actor) => {
|
||||
await actor.applyDamage(-finalDamage)
|
||||
// Create bleeding wound if D30 triggered it
|
||||
if (d30Bleed && finalDamage > 0 && actor.system.hp?.wounds) {
|
||||
const wounds = foundry.utils.duplicate(actor.system.hp.wounds)
|
||||
const slot = wounds.findIndex(w => !w.value && !w.duration)
|
||||
if (slot !== -1) {
|
||||
wounds[slot] = { value: finalDamage, duration: finalDamage, description: "Bleeding" }
|
||||
await actor.update({ "system.hp.wounds": wounds })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (defender.isOwner) {
|
||||
// Resolve the token actor: prefer lookup by token ID (exact match for unlinked monsters),
|
||||
// fall back to combatant actor, then base world actor.
|
||||
const tokenActor = (defenderTokenId
|
||||
? canvas.tokens?.placeables?.find(t => t.id === defenderTokenId)?.actor
|
||||
: defenderCombatant?.actor) ?? defender
|
||||
await tokenActor.applyDamage(-finalDamage)
|
||||
await applyDamageToActor(tokenActor)
|
||||
} else {
|
||||
game.socket.emit(`system.${SYSTEM.id}`, { type: "applyDamage", actorId: defender.id, tokenId: defenderTokenId, damage: -finalDamage })
|
||||
// Also emit wound creation for bleeding
|
||||
if (d30Bleed && finalDamage > 0 && defender.system.hp?.wounds) {
|
||||
game.socket.emit(`system.${SYSTEM.id}`, { type: "applyBleeding", actorId: defender.id, tokenId: defenderTokenId, damage: finalDamage })
|
||||
}
|
||||
}
|
||||
|
||||
// Build DR text for confirmation message
|
||||
let drText = ""
|
||||
if (isSpellDamage) {
|
||||
drText = manualDR > 0 ? `Spell DR: ${manualDR}` : "No DR applied"
|
||||
} else {
|
||||
const parts = []
|
||||
if (appliedBaseDR > 0) parts.push(`Base DR: ${appliedBaseDR}${d30DrMultiplier > 1 && appliedBaseDR !== baseDR ? ` (×${d30DrMultiplier})` : ""}`)
|
||||
if (appliedShieldDR > 0) parts.push(`Shield DR: ${appliedShieldDR}${d30DrMultiplier > 1 && appliedShieldDR !== shieldDR ? ` (×${d30DrMultiplier})` : ""}`)
|
||||
if (appliedMagicDR > 0) parts.push(`Magic DR: ${appliedMagicDR}${d30DrMultiplier > 1 && appliedMagicDR !== magicDR ? ` (×${d30DrMultiplier})` : ""}`)
|
||||
drText = parts.length > 0 ? parts.join(" + ") : "No DR applied"
|
||||
}
|
||||
|
||||
// Build raw damage text showing D30 multiplier if active
|
||||
const rawDamageText = d30DamageMultiplier > 1
|
||||
? `${damageTotal} × ${d30DamageMultiplier} = ${rawDamage}`
|
||||
: String(damageTotal)
|
||||
|
||||
// Créer un message de confirmation (visible to GM only)
|
||||
const messageContent = await foundry.applications.handlebars.renderTemplate(
|
||||
"systems/fvtt-lethal-fantasy/templates/damage-applied-message.hbs",
|
||||
{
|
||||
targetName: defender.name,
|
||||
damage: finalDamage,
|
||||
drText: isSpellDamage
|
||||
? (manualDR > 0 ? `Spell DR: ${manualDR}` : "No DR applied")
|
||||
: (totalDR > 0 ? `Armor DR: ${armorDR}${extraShieldDr > 0 ? ` + Shield DR: ${extraShieldDr}` : ""}` : ""),
|
||||
drText,
|
||||
weaponName: weaponName,
|
||||
attackerName: attackerName,
|
||||
rawDamage: damageTotal
|
||||
rawDamage: rawDamageText
|
||||
}
|
||||
)
|
||||
|
||||
// Add bleeding notification
|
||||
let bleedContent = ""
|
||||
if (d30Bleed && finalDamage > 0) {
|
||||
bleedContent = `<p><strong>Bleeding:</strong> Wound of ${finalDamage} HP for ${finalDamage} seconds.</p>`
|
||||
}
|
||||
|
||||
await ChatMessage.create({
|
||||
content: messageContent,
|
||||
content: messageContent + bleedContent,
|
||||
speaker: ChatMessage.getSpeaker({ actor: defender }),
|
||||
whisper: ChatMessage.getWhisperRecipients("GM")
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user