+4 -2

src/main.ts

··· 1 import KingdomSheet from "./kingdom-sheet"; 2 import { registerSocket } from "./socket"; 3 import { handlers } from "./kingdom-desc"; 0 4 5 Hooks.on("init", (): void => { 6 KingdomSheet.register(); ··· 14 const button = el as HTMLButtonElement; 15 16 button.onclick = (ev: PointerEvent): void => { 17 - // TODO: figure out how to pass the actor ID at least to the chat message 18 - console.log("clicked", ev); 0 19 }; 20 }); 21 });

··· 1 import KingdomSheet from "./kingdom-sheet"; 2 import { registerSocket } from "./socket"; 3 import { handlers } from "./kingdom-desc"; 4 + import type { KingdomActor } from "./global"; 5 6 Hooks.on("init", (): void => { 7 KingdomSheet.register(); ··· 15 const button = el as HTMLButtonElement; 16 17 button.onclick = (ev: PointerEvent): void => { 18 + const data: Record<string, any> = (ev.target as HTMLElement).dataset; 19 + const kingdomActor: KingdomActor = (game as foundry.Game).actors.get(data.kingdomActor!); 20 + handlers[data.action as string](kingdomActor, ev); 21 }; 22 }); 23 });

+2 -2

src/socket.ts

··· 2 import type { Socket, isocketlib } from "./utils"; 3 import type * as Data from "./data"; 4 import type { AttributeInfo } from "./kingdom"; 5 - import { kmLocalize, capitalize, enrichAndLocalize } from "./utils"; 6 declare var socketlib: isocketlib; 7 8 export let socket: Socket | null = null; ··· 228 "CritSuccess" 229 ]; 230 231 - const msg = await enrichAndLocalize(true, "activities", activityId, "results", result.degreeOfSuccess.toString(), "msg"); 232 233 return `<b>${(game as foundry.Game).i18n!.localize(`PF2E.${keys[result.degreeOfSuccess]}`)}</b> ${msg}`; 234 }).then((msg: string): void => {

··· 2 import type { Socket, isocketlib } from "./utils"; 3 import type * as Data from "./data"; 4 import type { AttributeInfo } from "./kingdom"; 5 + import { kmLocalize, capitalize, enrichAndLocalize, ealWithActor } from "./utils"; 6 declare var socketlib: isocketlib; 7 8 export let socket: Socket | null = null; ··· 228 "CritSuccess" 229 ]; 230 231 + const msg = await ealWithActor(true, actor, "activities", activityId, "results", result.degreeOfSuccess.toString(), "msg"); 232 233 return `<b>${(game as foundry.Game).i18n!.localize(`PF2E.${keys[result.degreeOfSuccess]}`)}</b> ${msg}`; 234 }).then((msg: string): void => {

+2 -1

src/svelte/tabs/turn.svelte

··· 177 function performRoll(event: Event): void { 178 const activityData = JSON.parse((event.target as HTMLElement).dataset.rollData!); 179 const rollData = activityData.rollData; 0 180 const leaderActor = (game as foundry.Game).actors.get(actor.getFlag("kingdom-homebrew", `leaders.${rollData.leader}`)); 181 182 const leaders: Record<string, string> = { ··· 376 ({(game as foundry.Game).i18n!.localize(`PF2E.ProficiencyLevel${activity.rollData.rank}`)}) 377 {/if} 378 </h4> 379 - <button onclick={performRoll} data-roll-data={JSON.stringify(activity.rollData)} class="kmhb-action-button" disabled={getPerformButtonDisabled(activity)}>{kmLocalize("check")} <i class="fa-solid fa-dice-d20"></i></button> 380 <KingdomDesc actor={actor} activityData={activity} /> 381 </div> 382 {/each}

··· 177 function performRoll(event: Event): void { 178 const activityData = JSON.parse((event.target as HTMLElement).dataset.rollData!); 179 const rollData = activityData.rollData; 180 + console.log(rollData); 181 const leaderActor = (game as foundry.Game).actors.get(actor.getFlag("kingdom-homebrew", `leaders.${rollData.leader}`)); 182 183 const leaders: Record<string, string> = { ··· 377 ({(game as foundry.Game).i18n!.localize(`PF2E.ProficiencyLevel${activity.rollData.rank}`)}) 378 {/if} 379 </h4> 380 + <button onclick={performRoll} data-roll-data={JSON.stringify({id: activity.id, rollData: activity.rollData})} class="kmhb-action-button" disabled={getPerformButtonDisabled(activity)}>{kmLocalize("check")} <i class="fa-solid fa-dice-d20"></i></button> 381 <KingdomDesc actor={actor} activityData={activity} /> 382 </div> 383 {/each}

+9 -1

src/utils.ts

··· 30 return (game as foundry.Game).i18n!.localize(`kingdom-homebrew.${args.join(".")}`); 31 } 32 33 - export async function enrichText(raw: string, markdown: boolean, enrichedOptions: object = {}): Promise<string> { 34 let text = raw; 35 36 if (markdown) { ··· 54 label = kmLocalize("applyEffect"); 55 } 56 0 0 0 0 57 text = text.replace(match[0], `<button class="kmhb-button" data-action="${action}" ${Object.entries(actionData).map((value: [string, string]): string => { 58 return `data-${value[0]}="${value[1]}"`; 59 }).join(" ")}>${label}</button>`); ··· 79 80 export async function enrichAndLocalize(markdown: boolean, ...args: string[]): Promise<string> { 81 return enrichText(kmLocalize(...args), markdown); 0 0 0 0 82 } 83 84 export enum SettlementTerrain {

··· 30 return (game as foundry.Game).i18n!.localize(`kingdom-homebrew.${args.join(".")}`); 31 } 32 33 + export async function enrichText(raw: string, markdown: boolean, actor: KingdomActor | null = null, enrichedOptions: object = {}): Promise<string> { 34 let text = raw; 35 36 if (markdown) { ··· 54 label = kmLocalize("applyEffect"); 55 } 56 57 + if (actor !== null) { 58 + actionData["kingdom-actor"] = actor.id; 59 + } 60 + 61 text = text.replace(match[0], `<button class="kmhb-button" data-action="${action}" ${Object.entries(actionData).map((value: [string, string]): string => { 62 return `data-${value[0]}="${value[1]}"`; 63 }).join(" ")}>${label}</button>`); ··· 83 84 export async function enrichAndLocalize(markdown: boolean, ...args: string[]): Promise<string> { 85 return enrichText(kmLocalize(...args), markdown); 86 + } 87 + 88 + export async function ealWithActor(markdown: boolean, actor: KingdomActor, ...args: string[]): Promise<string> { 89 + return enrichText(kmLocalize(...args), markdown, actor); 90 } 91 92 export enum SettlementTerrain {