@jjlmoya/utils-tabletop 1.34.0 → 1.36.0

package/src/tool/rpg-settlement-exploration-map-generator/component.astro

@@ -9,6 +9,15 @@ const { ui } = Astro.props;
 const initialMap = generateSettlement(DEFAULT_CONFIG);
 const initialEvaluation = evaluateSettlement(initialMap, ui);
 const builtInServices = ['tavern', 'smithy', 'temple', 'market', 'stable', 'hall'] as const;
+const styleOptions = [
+  { value: 'medieval', label: ui.styleMedieval },
+  { value: 'edo', label: ui.styleEdo },
+  { value: 'sahelian', label: ui.styleSahelian },
+  { value: 'timber', label: ui.styleTimber },
+  { value: 'stone', label: ui.styleStone },
+  { value: 'coastal', label: ui.styleCoastal },
+  { value: 'highland', label: ui.styleHighland },
+] as const;
 ---
 <div class="rsm" data-settlement-tool>
   <script is:inline type="application/json" data-ui set:html={JSON.stringify(ui)} />
@@ -28,7 +37,7 @@ const builtInServices = ['tavern', 'smithy', 'temple', 'market', 'stable', 'hall
       <div class="rsm-field">
         <span class="rsm-label">{ui.styleLabel}</span>
         <small>{ui.styleHint}</small>
-        <div class="rsm-choice-row" data-styles>{(['medieval', 'edo', 'sahelian', 'timber', 'stone', 'coastal', 'highland'] as const).map((style) => <button type="button" class:list={{ 'rsm-choice': true, 'is-active': style === DEFAULT_CONFIG.style }} data-style={style} aria-pressed={style === DEFAULT_CONFIG.style}>{ui[`style${style.charAt(0).toUpperCase()}${style.slice(1)}`]}</button>)}</div>
+        <div class="rsm-choice-row" data-styles>{styleOptions.map((option) => <button type="button" class:list={{ 'rsm-choice': true, 'is-active': option.value === DEFAULT_CONFIG.style }} data-style={option.value} aria-pressed={option.value === DEFAULT_CONFIG.style}>{option.label}</button>)}</div>
       </div>
       <div class="rsm-field">
         <span class="rsm-label">{ui.sizeLabel}</span>
@@ -46,15 +55,17 @@ const builtInServices = ['tavern', 'smithy', 'temple', 'market', 'stable', 'hall
       <fieldset class="rsm-field rsm-services">
         <legend>{ui.servicesLabel}</legend>
         <small>{ui.serviceListHint}</small>
-        <div class="rsm-service-row" data-service-list>{builtInServices.map((service) => <div class="rsm-service-entry" data-service-entry={service}><label class="rsm-service-chip"><input type="checkbox" value={service} data-service-option checked={DEFAULT_CONFIG.services.includes(service)} /><span>{ui[`service${service.charAt(0).toUpperCase()}${service.slice(1)}`]}</span></label></div>)}</div>
+        <div class="rsm-service-row" data-service-list aria-label={ui.serviceSelectLabel}>{builtInServices.map((service) => <div class="rsm-service-entry" data-service-entry={service}><label class="rsm-service-chip"><input type="checkbox" value={service} data-service-option checked={DEFAULT_CONFIG.services.includes(service)} /><span>{ui[`service${service.charAt(0).toUpperCase()}${service.slice(1)}`]}</span></label></div>)}</div>
         <div class="rsm-add-service"><input id="rsm-new-service" type="text" data-new-service aria-label={ui.newServicePlaceholder} placeholder={ui.newServicePlaceholder} maxlength="28" /><button type="button" data-add-service>{ui.addService}</button></div>
       </fieldset>
       <button type="button" class="rsm-generate" data-generate>{ui.generate}</button>
     </div>
     <div class="rsm-map-column">
       <div class="rsm-map-heading"><div><span class="rsm-eyebrow">{ui.mapSummary}</span><strong data-terrain>{initialEvaluation.terrainLabel}</strong></div><span class="rsm-badge" data-badge>{initialEvaluation.badge}</span></div>
-      <div class="rsm-map-frame"><div class="rsm-map-host" data-map-host set:html={buildMapSvg(initialMap, ui)}></div><div class="rsm-map-help">{ui.clickHint}</div><div class="rsm-context-menu" data-context-menu hidden role="menu" aria-label={ui.contextMenuLabel}><button type="button" data-context-tool="select" role="menuitem">{ui.contextInspect}</button><button type="button" data-context-tool="building" role="menuitem">{ui.contextBuilding}</button><button type="button" data-context-tool="path" role="menuitem">{ui.contextPath}</button><button type="button" data-context-tool="water" role="menuitem">{ui.contextWater}</button><button type="button" data-context-tool="tree" role="menuitem">{ui.contextTree}</button><button type="button" data-context-tool="erase" role="menuitem">{ui.contextErase}</button></div></div>
+      <div class="rsm-map-tools" aria-label={ui.editLabel}><span class="rsm-label">{ui.editLabel}</span><div class="rsm-tool-group"><button type="button" class="rsm-tool is-active" data-tool="select" aria-pressed="true">{ui.toolSelect}</button><button type="button" class="rsm-tool" data-tool="building" aria-pressed="false">{ui.toolBuilding}</button><button type="button" class="rsm-tool" data-tool="path" aria-pressed="false">{ui.toolPath}</button><button type="button" class="rsm-tool" data-tool="water" aria-pressed="false">{ui.toolWater}</button><button type="button" class="rsm-tool" data-tool="tree" aria-pressed="false">{ui.toolTree}</button><button type="button" class="rsm-tool" data-tool="erase" aria-pressed="false">{ui.toolErase}</button></div></div>
+      <div class="rsm-map-frame"><div class="rsm-map-host" data-map-host set:html={buildMapSvg(initialMap, ui)}></div><div class="rsm-map-help">{ui.clickHint} {ui.selectedHint}: {ui.serviceNone}</div><div class="rsm-context-menu" data-context-menu hidden role="menu" aria-label={ui.contextMenuLabel}><button type="button" data-context-tool="select" role="menuitem">{ui.contextInspect}</button><button type="button" data-context-tool="building" role="menuitem">{ui.contextBuilding}</button><button type="button" data-context-tool="path" role="menuitem">{ui.contextPath}</button><button type="button" data-context-tool="water" role="menuitem">{ui.contextWater}</button><button type="button" data-context-tool="tree" role="menuitem">{ui.contextTree}</button><button type="button" data-context-tool="erase" role="menuitem">{ui.contextErase}</button></div></div>
       <div class="rsm-stats" aria-live="polite"><div><span>{ui.buildings}</span><strong data-building-count>{initialEvaluation.buildingCount}</strong></div><div><span>{ui.paths}</span><strong data-path-count>{initialEvaluation.pathCount}</strong></div><div><span>{ui.services}</span><strong data-service-count>{initialEvaluation.serviceCount}</strong></div><div><span>{ui.terrain}</span><strong data-water-count>{initialEvaluation.waterCount}</strong></div></div>
+      <div class="rsm-legend" aria-label={ui.legendLabel}><span><i class="rsm-legend-home" aria-hidden="true"></i>{ui.legendHome}</span><span><i class="rsm-legend-service" aria-hidden="true"></i>{ui.legendService}</span><span><i class="rsm-legend-path" aria-hidden="true"></i>{ui.legendPath}</span><span><i class="rsm-legend-water" aria-hidden="true"></i>{ui.legendWater}</span><span><i class="rsm-legend-wild" aria-hidden="true"></i>{ui.legendWild}</span></div>
       <div class="rsm-actions"><button type="button" class="rsm-action-primary" data-share>{ui.shareLink}</button><button type="button" data-export-png>{ui.exportPng}</button><button type="button" data-export-svg>{ui.exportSvg}</button><details class="rsm-data-menu"><summary>{ui.mapData}</summary><div><button type="button" data-export-json>{ui.exportJson}</button><label><span>{ui.importJson}</span><input type="file" accept="application/json,.json" data-import-json /></label></div></details></div>
       <p class="rsm-status" data-status aria-live="polite"></p>
     </div>

package/src/tool/rpg-settlement-exploration-map-generator/editor.ts

@@ -5,6 +5,12 @@ interface CellPoint {
   y: number;
 }
 
+function bindToolButtons(root: HTMLElement, setActiveTool: (tool: EditTool) => void): void {
+  root.querySelectorAll<HTMLButtonElement>('[data-tool]').forEach((button) => button.addEventListener('click', () => {
+    setActiveTool(button.dataset.tool as EditTool);
+  }));
+}
+
 type EditHandler = (point: CellPoint, tool: EditTool) => void;
 
 function svgCell(event: MouseEvent, svg: SVGSVGElement): CellPoint | null {
@@ -60,10 +66,17 @@ function bindPointerEvents(opts: PointerOptions): void {
   opts.host.addEventListener('pointerleave', cancel);
 }
 
-export function bindContextEditor(root: HTMLElement, onEdit: EditHandler): void {
-  const host = root.querySelector<HTMLElement>('[data-map-host]');
-  const menu = root.querySelector<HTMLElement>('[data-context-menu]');
-  if (!host || !menu) return;
+function bindMapSelection(host: HTMLElement, getActiveTool: () => EditTool, onEdit: EditHandler): void {
+  host.addEventListener('click', (event) => {
+    const tool = getActiveTool();
+    if (tool === 'select') return;
+    const svg = (event.target as Element).closest<SVGSVGElement>('[data-settlement-map]');
+    const cell = svg ? svgCell(event, svg) : null;
+    if (cell) onEdit(cell, tool);
+  });
+}
+
+function bindContextMenu(root: HTMLElement, host: HTMLElement, menu: HTMLElement, onEdit: EditHandler): void {
   let selected: CellPoint | null = null;
   const flags: PointerFlags = { ignoreNextContext: false, ignoreNextClick: false };
   host.addEventListener('contextmenu', (event) => {
@@ -72,8 +85,8 @@ export function bindContextEditor(root: HTMLElement, onEdit: EditHandler): void
     selected = openContextMenu(root, menu, event);
   });
   bindPointerEvents({ host, root, menu, flags, onOpen: (cell) => { selected = cell; } });
-  menu.querySelectorAll<HTMLButtonElement>('[data-context-tool]').forEach((btn) => btn.addEventListener('click', () => {
-    if (selected) onEdit(selected, btn.dataset.contextTool as EditTool);
+  menu.querySelectorAll<HTMLButtonElement>('[data-context-tool]').forEach((button) => button.addEventListener('click', () => {
+    if (selected) onEdit(selected, button.dataset.contextTool as EditTool);
     menu.hidden = true;
   }));
   document.addEventListener('click', (event) => {
@@ -83,3 +96,22 @@ export function bindContextEditor(root: HTMLElement, onEdit: EditHandler): void
   window.addEventListener('resize', () => { menu.hidden = true; });
   window.addEventListener('scroll', () => { menu.hidden = true; }, true);
 }
+
+export function bindContextEditor(root: HTMLElement, onEdit: EditHandler): void {
+  const host = root.querySelector<HTMLElement>('[data-map-host]');
+  const menu = root.querySelector<HTMLElement>('[data-context-menu]');
+  if (!host || !menu) return;
+  let activeTool: EditTool = 'select';
+  const toolButtons = root.querySelectorAll<HTMLButtonElement>('[data-tool]');
+  const setActiveTool = (tool: EditTool): void => {
+    activeTool = tool;
+    toolButtons.forEach((button) => {
+      const active = button.dataset.tool === tool;
+      button.classList.toggle('is-active', active);
+      button.setAttribute('aria-pressed', String(active));
+    });
+  };
+  bindToolButtons(root, setActiveTool);
+  bindMapSelection(host, () => activeTool, onEdit);
+  bindContextMenu(root, host, menu, onEdit);
+}

package/src/tools.ts

@@ -16,6 +16,7 @@ import { ENCOUNTER_DIFFICULTY_CALCULATOR_TOOL } from './tool/encounter-difficult
 import { TOKEN_STAMP_STUDIO_TOOL } from './tool/token-stamp-studio';
 import { MUS_SCOREBOARD_TOOL } from './tool/mus-scoreboard';
 import { RPG_SETTLEMENT_EXPLORATION_MAP_GENERATOR_TOOL } from './tool/rpg-settlement-exploration-map-generator';
+import { CARD_DRAW_ODDS_CALCULATOR_TOOL } from './tool/card-draw-odds-calculator';
 
 export const ALL_TOOLS: ToolDefinition[] = [
   DICE_ROLLER_SIMULATOR_TOOL,
@@ -34,5 +35,6 @@ export const ALL_TOOLS: ToolDefinition[] = [
   TOKEN_STAMP_STUDIO_TOOL,
   MUS_SCOREBOARD_TOOL,
   RPG_SETTLEMENT_EXPLORATION_MAP_GENERATOR_TOOL,
+  CARD_DRAW_ODDS_CALCULATOR_TOOL,
 ];