Fixes and enhancements, from issue list

This commit is contained in:
2026-03-27 21:21:17 +01:00
parent f1dda301d7
commit c22c3d713b
25 changed files with 531 additions and 111 deletions

View File

@@ -10,9 +10,10 @@ export default class OathHammerPartySheet extends OathHammerActorSheet {
window: { contentClasses: ["party-content"] },
actions: {
openMember: OathHammerPartySheet.#onOpenMember,
removeMember: OathHammerPartySheet.#onRemoveMember,
moveMemberUp: OathHammerPartySheet.#onMoveMemberUp,
moveMemberDown: OathHammerPartySheet.#onMoveMemberDown,
removeMember: OathHammerPartySheet.#onRemoveMember,
moveMemberUp: OathHammerPartySheet.#onMoveMemberUp,
moveMemberDown: OathHammerPartySheet.#onMoveMemberDown,
toggleCarriesLight: OathHammerPartySheet.#onToggleCarriesLight,
adjustCurrency: OathHammerPartySheet.#onAdjustCurrency,
adjustQty: OathHammerPartySheet.#onAdjustQty,
},
@@ -53,28 +54,41 @@ export default class OathHammerPartySheet extends OathHammerActorSheet {
async _preparePartContext(partId, context) {
const doc = this.document
switch (partId) {
case "main":
case "main": {
const lootItems = doc.items.contents.filter(i => ALLOWED_LOOT_TYPES.has(i.type))
context.currentSlots = lootItems.reduce((sum, i) => {
const slots = i.system.slots ?? 0
const qty = i.system.quantity ?? 1
return sum + slots * qty
}, 0)
break
}
case "members": {
context.tab = context.tabs.members
const refs = doc.system.memberRefs ?? []
context.members = refs.map((id, idx) => {
const actor = game.actors?.get(id)
context.members = refs.map((ref, idx) => {
const actor = game.actors?.get(ref.id)
if (!actor) return null
const sys = actor.system
const classItem = actor.items?.find(i => i.type === "class")
const isNpc = actor.type === "npc"
const classItem = !isNpc ? actor.items?.find(i => i.type === "class") : null
return {
id: actor.id,
name: actor.name,
img: actor.img,
id: actor.id,
name: actor.name,
img: actor.img,
type: actor.type,
idx,
position: idx + 1,
isFirst: idx === 0,
isLast: idx === refs.length - 1,
classLabel: classItem?.name ?? "—",
level: sys.level ?? "—",
grit: sys.grit ? `${sys.grit.value}/${sys.grit.max}` : "—",
position: idx + 1,
isFirst: idx === 0,
isLast: idx === refs.length - 1,
carriesLight: ref.carriesLight ?? false,
classLabel: isNpc
? game.i18n.localize(`OATHHAMMER.NpcSubtype.${sys.subtype === "creature" ? "Creature" : "Npc"}`)
: (classItem?.name ?? "—"),
lineage: !isNpc ? (sys.lineage?.name || "—") : "—",
current: !isNpc ? (sys.experience?.current ?? "—") : "—",
grit: sys.grit ? `${sys.grit.value}/${sys.grit.max}` : "—",
}
}).filter(Boolean)
break
@@ -109,10 +123,10 @@ export default class OathHammerPartySheet extends OathHammerActorSheet {
if (data.type === "Actor") {
const actor = await fromUuid(data.uuid)
if (!actor || actor.type !== "character") return
if (!actor || !["character", "npc"].includes(actor.type)) return
const refs = foundry.utils.deepClone(this.document.system.memberRefs ?? [])
if (refs.includes(actor.id)) return
refs.push(actor.id)
if (refs.some(r => r.id === actor.id)) return
refs.push({ id: actor.id, carriesLight: false })
return this.document.update({ "system.memberRefs": refs })
}
@@ -132,7 +146,7 @@ export default class OathHammerPartySheet extends OathHammerActorSheet {
static async #onRemoveMember(event, target) {
const id = target.dataset.actorId
const refs = (this.document.system.memberRefs ?? []).filter(r => r !== id)
const refs = (this.document.system.memberRefs ?? []).filter(r => r.id !== id)
await this.document.update({ "system.memberRefs": refs })
}
@@ -152,6 +166,14 @@ export default class OathHammerPartySheet extends OathHammerActorSheet {
await this.document.update({ "system.memberRefs": refs })
}
static async #onToggleCarriesLight(event, target) {
const idx = parseInt(target.dataset.idx, 10)
const refs = foundry.utils.deepClone(this.document.system.memberRefs ?? [])
if (!refs[idx]) return
refs[idx].carriesLight = !refs[idx].carriesLight
await this.document.update({ "system.memberRefs": refs })
}
static async #onAdjustCurrency(event, target) {
const field = target.dataset.field
const delta = parseInt(target.dataset.delta, 10)