Fixes and enhancements, from issue list

This commit is contained in:
2026-03-27 22:28:47 +01:00
parent c22c3d713b
commit 2bf737a3ef
6 changed files with 126 additions and 105 deletions

View File

@@ -163,19 +163,20 @@ export default class OathHammerRegimentSheet extends OathHammerActorSheet {
visibility: game.settings.get("core", "rollMode")
}
)
const result = await foundry.applications.api.DialogV2.prompt({
const result = await foundry.applications.api.DialogV2.wait({
window: { title: `${doc.name}${game.i18n.localize("OATHHAMMER.Roll.ArmorRoll")}`, resizable: true },
classes: ["fvtt-oath-hammer"], position: { width: 420 }, content,
ok: { label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6" },
rejectClose: false,
buttons: [{ label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6",
callback: (_ev, btn) => { const o = {}; for (const el of btn.form.elements) { if (!el.name) continue; o[el.name] = el.type === "checkbox" ? String(el.checked) : el.value } return o }
}],
})
if (!result) return
const form = new DOMParser().parseFromString(result, "text/html")
const getValue = n => form.querySelector(`[name="${n}"]`)?.value
await rollNPCArmor(doc, {
bonus: parseInt(getValue("bonus")) || 0,
colorOverride: getValue("colorOverride") || null,
explodeOn5: getValue("explodeOn5") === "true",
visibility: getValue("visibility"),
bonus: parseInt(result.bonus) || 0,
colorOverride: result.colorOverride || null,
explodeOn5: result.explodeOn5 === "true",
visibility: result.visibility,
})
}
@@ -200,19 +201,20 @@ export default class OathHammerRegimentSheet extends OathHammerActorSheet {
visibility: game.settings.get("core", "rollMode")
}
)
const result = await foundry.applications.api.DialogV2.prompt({
const result = await foundry.applications.api.DialogV2.wait({
window: { title: `${skill.name}${game.i18n.localize("OATHHAMMER.Tab.Skills")}`, resizable: true },
classes: ["fvtt-oath-hammer"], position: { width: 420 }, content,
ok: { label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6" },
rejectClose: false,
buttons: [{ label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6",
callback: (_ev, btn) => { const o = {}; for (const el of btn.form.elements) { if (!el.name) continue; o[el.name] = el.type === "checkbox" ? String(el.checked) : el.value } return o }
}],
})
if (!result) return
const form = new DOMParser().parseFromString(result, "text/html")
const getValue = n => form.querySelector(`[name="${n}"]`)?.value
await rollNPCSkill(this.document, skill, {
bonus: parseInt(getValue("bonus")) || 0,
colorOverride: getValue("colorOverride") || null,
explodeOn5: getValue("explodeOn5") === "true",
visibility: getValue("visibility"),
bonus: parseInt(result.bonus) || 0,
colorOverride: result.colorOverride || null,
explodeOn5: result.explodeOn5 === "true",
visibility: result.visibility,
})
}
@@ -244,19 +246,20 @@ export default class OathHammerRegimentSheet extends OathHammerActorSheet {
visibility: game.settings.get("core", "rollMode")
}
)
const result = await foundry.applications.api.DialogV2.prompt({
const result = await foundry.applications.api.DialogV2.wait({
window: { title: `${attack.name}${game.i18n.localize("OATHHAMMER.Dialog.Damage")}`, resizable: true },
classes: ["fvtt-oath-hammer"], position: { width: 420 }, content,
ok: { label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6" },
rejectClose: false,
buttons: [{ label: game.i18n.localize("OATHHAMMER.Dialog.Roll"), icon: "fa-solid fa-dice-d6",
callback: (_ev, btn) => { const o = {}; for (const el of btn.form.elements) { if (!el.name) continue; o[el.name] = el.type === "checkbox" ? String(el.checked) : el.value } return o }
}],
})
if (!result) return
const form = new DOMParser().parseFromString(result, "text/html")
const getValue = n => form.querySelector(`[name="${n}"]`)?.value
await rollNPCAttackDamage(this.document, attack, {
bonus: parseInt(getValue("bonus")) || 0,
colorOverride: getValue("colorOverride") || null,
explodeOn5: getValue("explodeOn5") === "true",
visibility: getValue("visibility"),
bonus: parseInt(result.bonus) || 0,
colorOverride: result.colorOverride || null,
explodeOn5: result.explodeOn5 === "true",
visibility: result.visibility,
})
}