${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}
`
- : ""
+ const explodedCount = diceResults.filter(d => d.exploded).length
+ const modParts = []
+ if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (explodedCount > 0) modParts.push(`💥 ${explodedCount} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
+ const modLine = modParts.length ? `
@@ -1025,6 +1035,7 @@ export async function rollNPCWeaponAttack(actor, weapon, options = {}) {
const modParts = []
if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (diceResults.filter(d => d.exploded).length > 0) modParts.push(`💥 ${diceResults.filter(d => d.exploded).length} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const content = `
@@ -1067,6 +1078,7 @@ export async function rollNPCWeaponDamage(actor, weapon, options = {}) {
const modParts = []
if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (diceResults.filter(d => d.exploded).length > 0) modParts.push(`💥 ${diceResults.filter(d => d.exploded).length} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const content = `
@@ -1098,7 +1110,7 @@ export async function rollNPCWeaponDamage(actor, weapon, options = {}) {
* NPC armor dice roll — rolls actor's armorDice.value dice with armorDice.colorDiceType color.
*/
export async function rollNPCArmor(actor, options = {}) {
- const { bonus = 0, colorOverride, visibility } = options
+ const { bonus = 0, colorOverride, visibility, explodeOn5 = false } = options
const sys = actor.system
const basePool = sys.armorDice?.value ?? 0
@@ -1107,12 +1119,15 @@ export async function rollNPCArmor(actor, options = {}) {
const colorEmoji = colorType === "black" ? "⬛" : colorType === "red" ? "🔴" : "⬜"
const totalDice = Math.max(basePool + bonus, 1)
- const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, false)
+ const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, explodeOn5)
const diceHtml = _diceHtml(diceResults, threshold)
- const modLine = bonus !== 0
- ? `
${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}
`
- : ""
+ const explodedCount = diceResults.filter(d => d.exploded).length
+ const modParts = []
+ if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (explodeOn5) modParts.push(`💥 ${game.i18n.localize("OATHHAMMER.Dialog.ExplodeOn5")}`)
+ if (explodedCount > 0) modParts.push(`💥 ${explodedCount} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
+ const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const label = game.i18n.localize("OATHHAMMER.Label.ArmorDice")
const content = `
@@ -1144,20 +1159,23 @@ export async function rollNPCArmor(actor, options = {}) {
* NPC spell cast — flat dice pool, no arcane stress, posts DV success/failure to chat.
*/
export async function rollNPCSpell(actor, spell, options = {}) {
- const { dicePool = 3, bonus = 0, colorOverride, visibility } = options
+ const { dicePool = 3, bonus = 0, colorOverride, visibility, explodeOn5 = false } = options
const dv = spell.system.difficultyValue ?? 1
const colorType = colorOverride || "white"
const threshold = colorType === "black" ? 2 : colorType === "red" ? 3 : 4
const colorEmoji = colorType === "black" ? "⬛" : colorType === "red" ? "🔴" : "⬜"
const totalDice = Math.max(dicePool + bonus, 1)
- const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, false)
+ const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, explodeOn5)
const diceHtml = _diceHtml(diceResults, threshold)
const isSuccess = successes >= dv
- const modLine = bonus !== 0
- ? `
${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}
`
- : ""
+ const explodedCount = diceResults.filter(d => d.exploded).length
+ const modParts = []
+ if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (explodeOn5) modParts.push(`💥 ${game.i18n.localize("OATHHAMMER.Dialog.ExplodeOn5")}`)
+ if (explodedCount > 0) modParts.push(`💥 ${explodedCount} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
+ const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const resultClass = isSuccess ? "roll-success" : "roll-failure"
const resultLabel = isSuccess
@@ -1193,19 +1211,22 @@ export async function rollNPCSpell(actor, spell, options = {}) {
* NPC miracle invocation — flat dice pool, no blocked tracking, posts DV success/failure to chat.
*/
export async function rollNPCMiracle(actor, miracle, options = {}) {
- const { dicePool = 3, bonus = 0, visibility } = options
+ const { dicePool = 3, bonus = 0, visibility, explodeOn5 = false } = options
const dv = 1
const threshold = 4
const colorEmoji = "⬜"
const totalDice = Math.max(dicePool + bonus, 1)
- const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, false)
+ const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, explodeOn5)
const diceHtml = _diceHtml(diceResults, threshold)
const isSuccess = successes >= dv
- const modLine = bonus !== 0
- ? `
${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}
`
- : ""
+ const explodedCount = diceResults.filter(d => d.exploded).length
+ const modParts = []
+ if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (explodeOn5) modParts.push(`💥 ${game.i18n.localize("OATHHAMMER.Dialog.ExplodeOn5")}`)
+ if (explodedCount > 0) modParts.push(`💥 ${explodedCount} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
+ const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const resultClass = isSuccess ? "roll-success" : "roll-failure"
const resultLabel = isSuccess
@@ -1241,7 +1262,7 @@ export async function rollNPCMiracle(actor, miracle, options = {}) {
* NPC attack damage roll — flat dice pool from the npcattack item, no Might.
*/
export async function rollNPCAttackDamage(actor, attack, options = {}) {
- const { bonus = 0, visibility } = options
+ const { bonus = 0, visibility, explodeOn5 = false } = options
const sys = attack.system
const colorType = sys.colorDiceType || "white"
const threshold = colorType === "black" ? 2 : colorType === "red" ? 3 : 4
@@ -1249,12 +1270,15 @@ export async function rollNPCAttackDamage(actor, attack, options = {}) {
const totalDice = Math.max((sys.damageDice ?? 1) + bonus, 1)
const ap = sys.ap ?? 0
- const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, false)
+ const { roll, rolls, successes, diceResults } = await _rollPool(totalDice, threshold, explodeOn5)
const diceHtml = _diceHtml(diceResults, threshold)
+ const explodedCount = diceResults.filter(d => d.exploded).length
const modParts = []
- if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
- if (ap > 0) modParts.push(`AP ${ap}`)
+ if (bonus !== 0) modParts.push(`${bonus > 0 ? "+" : ""}${bonus} ${game.i18n.localize("OATHHAMMER.Dialog.Modifier")}`)
+ if (ap > 0) modParts.push(`AP ${ap}`)
+ if (explodeOn5) modParts.push(`💥 ${game.i18n.localize("OATHHAMMER.Dialog.ExplodeOn5")}`)
+ if (explodedCount > 0) modParts.push(`💥 ${explodedCount} ${game.i18n.localize("OATHHAMMER.Roll.Exploded")}`)
const modLine = modParts.length ? `
${modParts.join(" · ")}
` : ""
const content = `
diff --git a/oath-hammer.mjs b/oath-hammer.mjs
index 6a3e948..ddcce8a 100644
--- a/oath-hammer.mjs
+++ b/oath-hammer.mjs
@@ -104,24 +104,45 @@ Hooks.once("init", function () {
Hooks.once("ready", async function () {
console.info("Oath Hammer | System Ready")
- // Migration: remove orphaned items with removed types (lineage → actor field, ability → trait)
- const removedTypes = new Set(["lineage", "ability"])
+ // Migration: remove orphaned items with removed types (lineage → actor field, ability → trait, regiment → actor type)
+ const removedTypes = new Set(["lineage", "ability", "regiment"])
for (const actor of game.actors) {
- const invalidItems = actor._source.items?.filter(i => removedTypes.has(i.type)) ?? []
- if (invalidItems.length) {
- console.info(`Oath Hammer | Migrating ${actor.name}: removing ${invalidItems.length} obsolete item(s)`)
- await actor.deleteEmbeddedDocuments("Item", invalidItems.map(i => i._id))
+ const toDelete = []
+
+ // Catch items that failed validation and landed in invalidDocumentIds
+ for (const id of (actor.items.invalidDocumentIds ?? [])) {
+ const raw = actor.items.getInvalid(id)
+ if (raw && removedTypes.has(raw._source?.type)) toDelete.push(id)
+ }
+
+ // Also catch any that slipped through in _source (belt-and-suspenders)
+ for (const src of (actor._source.items ?? [])) {
+ if (removedTypes.has(src.type) && !toDelete.includes(src._id)) toDelete.push(src._id)
+ }
+
+ if (toDelete.length) {
+ console.info(`Oath Hammer | Migrating ${actor.name}: removing ${toDelete.length} obsolete item(s)`)
+ await actor.deleteEmbeddedDocuments("Item", toDelete)
}
}
+
+ // Purge invalid world items of removed types
for (const id of game.items.invalidDocumentIds) {
const item = game.items.getInvalid(id)
- if (item && removedTypes.has(item._source.type)) {
+ if (item && removedTypes.has(item._source?.type)) {
console.info(`Oath Hammer | Deleting world item: ${item._source.name} (${item._source.type})`)
await item.delete()
}
}
})
+// Auto-link regiment (and army) actor tokens so they can be added to garrisons/armies
+Hooks.on("preCreateActor", (actor, _data, _options, _userId) => {
+ if (actor.type === "regiment" || actor.type === "army") {
+ actor.updateSource({ "prototypeToken.actorLink": true })
+ }
+})
+
// Handle "Roll Damage" button in weapon attack chat cards
Hooks.on("renderChatMessageHTML", (message, html) => {
const btn = html.querySelector("[data-action=\"rollWeaponDamage\"]")
diff --git a/templates/actor/character-sheet.hbs b/templates/actor/character-sheet.hbs
index 3d9e2f3..ed676d2 100644
--- a/templates/actor/character-sheet.hbs
+++ b/templates/actor/character-sheet.hbs
@@ -54,9 +54,13 @@
/
{{formInput systemFields.grit.fields.max value=system.grit.max name="system.grit.max" disabled=isPlayMode}}