- ${renderHistoryTable(entries, cfg.columns, cfg.id, rowsPerPage, 1)}
+ const state = getHistoryPageState(actor.id, cfg.id);
+ let rowsPerPage = state.pageSize === "all" ? "all" : Math.max(1, Number(state.pageSize) || 10);
+ let currentPage = Math.max(1, Number(state.page) || 1);
+ const totalPages = rowsPerPage === "all" ? 1 : Math.max(1, Math.ceil(entries.length / rowsPerPage));
+ if (currentPage > totalPages) {
+ currentPage = totalPages;
+ setHistoryPageState(actor.id, cfg.id, currentPage, rowsPerPage);
+ }
+ const selectOptions = [10, 20, 50, "all"]
+ .map((value) => `
`)
+ .join("");
+ return `
+ ${renderHistoryTable(entries, cfg.columns, cfg.id, rowsPerPage, currentPage)}
`;
@@ -1030,8 +1078,21 @@ async function recordHistoryEntry(actor, statId, previous, nextValue, userId, op
let encounterId = game.combat?.id ?? null;
console.log(`[GowlersTracking] Recording ${statId} change - Active combat: ${encounterId ? "Yes (" + encounterId + ")" : "No"}`);
- // If no active combat but XP is being recorded shortly after combat ended, link to last encounter
- if (!encounterId && statId === "xp" && ledgerState.lastCombatId) {
+ // If no active combat but XP is being recorded shortly after combat ended, link to last encounter (unless explicitly manual)
+ const manualXp =
+ statId === "xp" &&
+ (options?.manualXp === true || options?.type === "ManualXP" || options?.skipEncounterLink === true);
+
+ const hasExplicitEncounter =
+ statId === "xp" &&
+ (options?.encounterId || change?.encounterId || options?.encounter?.id || options?.encounter?._id);
+
+ const canLinkXpToLastCombat =
+ statId === "xp" &&
+ !manualXp &&
+ (options?.type === "EncounterXP" || options?.type === "Encounter" || hasExplicitEncounter || game.combat?.id || ledgerState.lastCombatId);
+
+ if (!encounterId && statId === "xp" && ledgerState.lastCombatId && canLinkXpToLastCombat) {
const timeSinceEnd = Date.now() - ledgerState.lastCombatEndTime;
// Link to last encounter if within 30 seconds (allows time for XP award after combat ends)
if (timeSinceEnd < 30000) {
@@ -1042,6 +1103,14 @@ async function recordHistoryEntry(actor, statId, previous, nextValue, userId, op
}
}
+ // Allow explicit encounter ID/name payloads to override when provided (e.g., encounter XP awards)
+ if (statId === "xp") {
+ if (options?.encounterId) encounterId = options.encounterId;
+ else if (change?.encounterId) encounterId = change.encounterId;
+ else if (options?.encounter?.id) encounterId = options.encounter.id;
+ else if (options?.encounter?._id) encounterId = options.encounter._id;
+ }
+
// Detect source of the change with actor and item details
let source = "Manual";
let sourceDetails = "";
@@ -1091,8 +1160,10 @@ async function recordHistoryEntry(actor, statId, previous, nextValue, userId, op
damageBreakdown = `${hpDiff} healing`;
}
} else if (statId === "xp" && diffValue > 0) {
- // XP gains - could be from encounter end or manual award
- source = "XP Award";
+ // XP gains - encounter or manual award
+ source = options?.source ?? (encounterId ? "Encounter XP Award" : "XP Award");
+ if (options?.encounterName) sourceDetails = options.encounterName;
+ if (!sourceDetails && encounterId) sourceDetails = encounterId.slice?.(0, 8) ?? encounterId;
damageBreakdown = `${diffValue} XP`;
} else if (statId === "currency" && diffValue !== 0) {
// Currency changes
@@ -1286,6 +1357,41 @@ function isNonlethalType(type) {
return String(type ?? "").toLowerCase() === "nonlethal";
}
+function resolveParticipantName(participant) {
+ if (!participant) return "Unknown";
+
+ // Objects that already include an id or name
+ if (typeof participant === "object") {
+ if (participant.name) return participant.name;
+ if (participant.id) {
+ const actor = game.actors.get(participant.id);
+ if (actor) return actor.name;
+ }
+ }
+
+ if (typeof participant === "string") {
+ // Try UUID first (token or actor)
+ try {
+ if (typeof fromUuidSync === "function") {
+ const doc = fromUuidSync(participant);
+ if (doc?.name) return doc.name;
+ if (doc?.actor?.name) return doc.actor.name;
+ }
+ } catch (err) {
+ // Ignore UUID errors, fall through
+ }
+
+ // Try direct actor lookup by ID
+ const actor = game.actors.get(participant);
+ if (actor) return actor.name;
+
+ // Fallback to trimmed ID preview
+ return participant.slice(0, 8);
+ }
+
+ return "Unknown";
+}
+
function checkboxValue(value, fallback = false) {
if (value === undefined || value === null) return fallback;
if (Array.isArray(value)) value = value[value.length - 1];