@edv4h/usketch-plugin-map 0.3.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/dist/base/base-layer.d.ts.map +1 -1
  2. package/dist/base/base-layer.js +30 -6
  3. package/dist/base/base-layer.js.map +1 -1
  4. package/dist/base/base-map-shape.d.ts +6 -6
  5. package/dist/base/base-map-shape.d.ts.map +1 -1
  6. package/dist/base/base-map-shape.js +6 -28
  7. package/dist/base/base-map-shape.js.map +1 -1
  8. package/dist/base/base-ops.d.ts +16 -23
  9. package/dist/base/base-ops.d.ts.map +1 -1
  10. package/dist/base/base-ops.js +101 -101
  11. package/dist/base/base-ops.js.map +1 -1
  12. package/dist/base/base-state.d.ts +3 -2
  13. package/dist/base/base-state.d.ts.map +1 -1
  14. package/dist/base/base-state.js +4 -3
  15. package/dist/base/base-state.js.map +1 -1
  16. package/dist/base/enter-banner.d.ts.map +1 -1
  17. package/dist/base/enter-banner.js +5 -2
  18. package/dist/base/enter-banner.js.map +1 -1
  19. package/dist/base/territory.d.ts +9 -0
  20. package/dist/base/territory.d.ts.map +1 -0
  21. package/dist/base/territory.js +128 -0
  22. package/dist/base/territory.js.map +1 -0
  23. package/dist/generate.d.ts.map +1 -1
  24. package/dist/generate.js +25 -5
  25. package/dist/generate.js.map +1 -1
  26. package/dist/hud/register-map-hud.d.ts +8 -0
  27. package/dist/hud/register-map-hud.d.ts.map +1 -0
  28. package/dist/hud/register-map-hud.js +269 -0
  29. package/dist/hud/register-map-hud.js.map +1 -0
  30. package/dist/index.d.ts +2 -1
  31. package/dist/index.d.ts.map +1 -1
  32. package/dist/index.js +1 -0
  33. package/dist/index.js.map +1 -1
  34. package/dist/map-icon-shape.d.ts +3 -0
  35. package/dist/map-icon-shape.d.ts.map +1 -1
  36. package/dist/map-icon-shape.js.map +1 -1
  37. package/dist/map-tool.d.ts.map +1 -1
  38. package/dist/map-tool.js +57 -61
  39. package/dist/map-tool.js.map +1 -1
  40. package/dist/plugin.d.ts.map +1 -1
  41. package/dist/plugin.js +6 -20
  42. package/dist/plugin.js.map +1 -1
  43. package/dist/range-erase-state.d.ts +0 -2
  44. package/dist/range-erase-state.d.ts.map +1 -1
  45. package/dist/range-erase-state.js +2 -2
  46. package/dist/range-erase-state.js.map +1 -1
  47. package/dist/range-erase.d.ts +2 -2
  48. package/dist/range-erase.d.ts.map +1 -1
  49. package/dist/range-erase.js +28 -55
  50. package/dist/range-erase.js.map +1 -1
  51. package/dist/tilemap-shape.d.ts +7 -0
  52. package/dist/tilemap-shape.d.ts.map +1 -1
  53. package/dist/tilemap-shape.js +1 -0
  54. package/dist/tilemap-shape.js.map +1 -1
  55. package/package.json +3 -3
  56. package/dist/ui/palette.d.ts +0 -7
  57. package/dist/ui/palette.d.ts.map +0 -1
  58. package/dist/ui/palette.js +0 -212
  59. package/dist/ui/palette.js.map +0 -1
  60. package/dist/ui/range-erase-palette.d.ts +0 -5
  61. package/dist/ui/range-erase-palette.d.ts.map +0 -1
  62. package/dist/ui/range-erase-palette.js +0 -43
  63. package/dist/ui/range-erase-palette.js.map +0 -1
@@ -1,11 +1,12 @@
1
- // Active base-tool interaction state, shared between the palette and the tool.
1
+ // Active base-tool interaction state, shared between the HUD and the tool.
2
2
  // Module-scoped, app-local (not synced). Base data itself lives in the synced
3
- // `base-map` shape; this is only which base/mode the local user is editing with.
3
+ // `base-map` shape; this is only which base the local user edits with, plus the
4
+ // terrains excluded from territory growth (a wall for the connectivity flood).
4
5
  import { useSyncExternalStore } from "react";
5
6
  import { createReactiveStore } from "../reactive-store.js";
6
7
  export const baseStateStore = createReactiveStore({
7
8
  activeBaseId: null,
8
- mode: "assign",
9
+ excludeTerrains: [],
9
10
  });
10
11
  export function useBaseState() {
11
12
  return useSyncExternalStore(baseStateStore.subscribe, baseStateStore.get, baseStateStore.get);
@@ -1 +1 @@
1
- {"version":3,"file":"base-state.js","sourceRoot":"","sources":["../../src/base/base-state.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,8EAA8E;AAC9E,iFAAiF;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAU3D,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAgB;IAChE,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,UAAU,YAAY;IAC3B,OAAO,oBAAoB,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;AAC/F,CAAC"}
1
+ {"version":3,"file":"base-state.js","sourceRoot":"","sources":["../../src/base/base-state.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,gFAAgF;AAChF,+EAA+E;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAU3D,MAAM,CAAC,MAAM,cAAc,GAAG,mBAAmB,CAAgB;IAChE,YAAY,EAAE,IAAI;IAClB,eAAe,EAAE,EAAE;CACnB,CAAC,CAAC;AAEH,MAAM,UAAU,YAAY;IAC3B,OAAO,oBAAoB,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;AAC/F,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"enter-banner.d.ts","sourceRoot":"","sources":["../../src/base/enter-banner.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAmBxD,wBAAgB,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,sCAiI/E"}
1
+ {"version":3,"file":"enter-banner.d.ts","sourceRoot":"","sources":["../../src/base/enter-banner.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAqBxD,wBAAgB,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,sCAsI/E"}
@@ -3,6 +3,8 @@ import { useEffect, useRef, useState } from "react";
3
3
  import { MAP_TOOL_ID } from "../map-tool-id.js";
4
4
  import { useMapToolState } from "../tool-state.js";
5
5
  import { baseIdAtWorld, getBaseMap } from "./base-ops.js";
6
+ import { baseStateStore } from "./base-state.js";
7
+ import { computeTerritory } from "./territory.js";
6
8
  const BANNER_MS = 2600;
7
9
  /** World point the local user is "standing on" — the viewport centre. */
8
10
  function viewportCenterWorld(store) {
@@ -41,8 +43,9 @@ export function EnterBanner({ store, tile }) {
41
43
  const base = getBaseMap(store);
42
44
  let id = null;
43
45
  const center = viewportCenterWorld(store);
44
- if (base && center && Object.keys(base.owner).length > 0) {
45
- id = baseIdAtWorld(base.owner, center.x, center.y, tile);
46
+ if (base && center) {
47
+ const territory = computeTerritory(store, tile, new Set(baseStateStore.get().excludeTerrains));
48
+ id = baseIdAtWorld(territory, center.x, center.y, tile);
46
49
  }
47
50
  if (id === prevRef.current)
48
51
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"enter-banner.js","sourceRoot":"","sources":["../../src/base/enter-banner.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"enter-banner.js","sourceRoot":"","sources":["../../src/base/enter-banner.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,yEAAyE;AACzE,SAAS,mBAAmB,CAAC,KAAiB;IAC7C,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC/C,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC/B,OAAO;QACN,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;QAC3C,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;KAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAuC;IAC/E,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAC/B,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;IACtE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAkB,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAkB,IAAI,CAAC,CAAC;IAC5D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAE3B,sFAAsF;IACtF,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,MAAM,UAAU,GAAG,UAAU,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;IAEtE,2EAA2E;IAC3E,qEAAqE;IACrE,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACF,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,MAAM,GAAG,GAAG,EAAE;YACnB,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE;gBAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC/B,IAAI,EAAE,GAAkB,IAAI,CAAC;gBAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAC1C,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;oBACpB,MAAM,SAAS,GAAG,gBAAgB,CACjC,KAAK,EACL,IAAI,EACJ,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAC7C,CAAC;oBACF,EAAE,GAAG,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;gBACzD,CAAC;gBACD,IAAI,EAAE,KAAK,OAAO,CAAC,OAAO;oBAAE,OAAO;gBACnC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1D,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,IAAI,EAAE,CAAC;oBACV,SAAS,CAAC,IAAI,CAAC,CAAC;oBAChB,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC;oBAC7D,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC/B,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;gBACxE,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,EAAE,CAAC;QACT,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE;YACX,CAAC,EAAE,CAAC;YACJ,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAElB,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAEtD,OAAO,CACN,eAAK,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,aACpE,0BAEE,+IAA+I,GAEzI,EAGP,MAAM,IAAI,CACV,eAEC,KAAK,EAAE;oBACN,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE,EAAE;oBACP,SAAS,EAAE,mBAAmB;oBAC9B,OAAO,EAAE,MAAM;oBACf,UAAU,EAAE,QAAQ;oBACpB,GAAG,EAAE,EAAE;oBACP,OAAO,EAAE,WAAW;oBACpB,UAAU,EAAE,uBAAuB;oBACnC,MAAM,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE;oBACnC,YAAY,EAAE,EAAE;oBAChB,IAAI,EAAE,gCAAgC;oBACtC,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,QAAQ;oBACpB,SAAS,EAAE,2BAA2B;oBACtC,SAAS,EAAE,gBAAgB,SAAS,sBAAsB;iBAC1D,aAED,eAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,uBAAU,EACvC,2BACC,eAAM,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,YAAG,MAAM,CAAC,IAAI,GAAQ,yDACpD,KAvBF,SAAS,CAwBT,CACN,EAGA,OAAO,IAAI,CACX,eACC,KAAK,EAAE;oBACN,QAAQ,EAAE,UAAU;oBACpB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,EAAE;oBACV,SAAS,EAAE,kBAAkB;oBAC7B,OAAO,EAAE,MAAM;oBACf,UAAU,EAAE,QAAQ;oBACpB,GAAG,EAAE,CAAC;oBACN,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,sBAAsB;oBAClC,MAAM,EAAE,aAAa,OAAO,CAAC,KAAK,EAAE;oBACpC,YAAY,EAAE,EAAE;oBAChB,IAAI,EAAE,gCAAgC;oBACtC,KAAK,EAAE,SAAS;oBAChB,UAAU,EAAE,QAAQ;oBACpB,SAAS,EAAE,4BAA4B;iBACvC,aAED,eACC,KAAK,EAAE;4BACN,KAAK,EAAE,EAAE;4BACT,MAAM,EAAE,EAAE;4BACV,YAAY,EAAE,KAAK;4BACnB,UAAU,EAAE,OAAO,CAAC,KAAK;4BACzB,IAAI,EAAE,MAAM;yBACZ,GACA,0BACI,OAAO,CAAC,IAAI,IACb,CACN,IACI,CACN,CAAC;AACH,CAAC"}
@@ -0,0 +1,9 @@
1
+ import type { BoardStore } from "@edv4h/usketch-shared";
2
+ /** cellKey("c,r") → baseId. Same shape as the old OwnerMap so renderers reuse it. */
3
+ export type Territory = Record<string, string>;
4
+ /**
5
+ * The derived territory (cellKey → baseId) for the whole board. Empty when there
6
+ * is no base-map or no base has a live beacon.
7
+ */
8
+ export declare function computeTerritory(store: BoardStore, tile: number, exclude: ReadonlySet<string>): Territory;
9
+ //# sourceMappingURL=territory.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"territory.d.ts","sourceRoot":"","sources":["../../src/base/territory.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAMxD,qFAAqF;AACrF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAwG/C;;;GAGG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAC1B,SAAS,CAuBX"}
@@ -0,0 +1,128 @@
1
+ import { cellKey, worldToCell } from "../autotile.js";
2
+ import { MAP_ICON_TYPE } from "../map-icon-shape.js";
3
+ import { isTileMap } from "../tilemap-shape.js";
4
+ import { isBaseMap } from "./base-map-shape.js";
5
+ const EMPTY_CELLS = {};
6
+ const EMPTY_HAND_PAINT = {};
7
+ const cache = new WeakMap();
8
+ function findBaseMap(store) {
9
+ for (const [, s] of store.getShapes())
10
+ if (isBaseMap(s))
11
+ return s;
12
+ return undefined;
13
+ }
14
+ function findTilemap(store) {
15
+ for (const [, s] of store.getShapes())
16
+ if (isTileMap(s))
17
+ return s;
18
+ return undefined;
19
+ }
20
+ function collectBeacons(store, bases) {
21
+ const icons = new Map();
22
+ for (const [, s] of store.getShapes()) {
23
+ if (s.type === MAP_ICON_TYPE)
24
+ icons.set(s.id, s);
25
+ }
26
+ const out = [];
27
+ for (const [baseId, info] of Object.entries(bases)) {
28
+ if (!info.beaconIconId)
29
+ continue;
30
+ const icon = icons.get(info.beaconIconId);
31
+ if (!icon)
32
+ continue;
33
+ out.push({
34
+ baseId,
35
+ cx: icon.x + icon.width / 2,
36
+ cy: icon.y + icon.height / 2,
37
+ radius: info.radius,
38
+ });
39
+ }
40
+ return out;
41
+ }
42
+ function signature(beacons, exclude) {
43
+ const b = beacons
44
+ .map((x) => `${x.baseId}:${Math.round(x.cx)}:${Math.round(x.cy)}:${x.radius}`)
45
+ .sort()
46
+ .join("|");
47
+ return `${b}#${[...exclude].sort().join(",")}`;
48
+ }
49
+ function build(beacons, cells, handPaint, tile, exclude) {
50
+ const territory = {};
51
+ const queue = [];
52
+ // 1) Core disk: every cell within `radius` of a beacon is owned, regardless of
53
+ // paint. Sorted so overlapping cores resolve deterministically (first wins).
54
+ const sorted = [...beacons].sort((a, b) => (a.baseId < b.baseId ? -1 : 1));
55
+ for (const bec of sorted) {
56
+ const [cc, cr] = worldToCell(bec.cx, bec.cy, tile);
57
+ const rSq = (bec.radius * tile) ** 2;
58
+ const span = Math.ceil(bec.radius);
59
+ for (let r = cr - span; r <= cr + span; r++) {
60
+ for (let c = cc - span; c <= cc + span; c++) {
61
+ const dx = (c + 0.5) * tile - bec.cx;
62
+ const dy = (r + 0.5) * tile - bec.cy;
63
+ if (dx * dx + dy * dy > rSq)
64
+ continue;
65
+ const k = cellKey(c, r);
66
+ if (k in territory)
67
+ continue;
68
+ territory[k] = bec.baseId;
69
+ queue.push([c, r]);
70
+ }
71
+ }
72
+ }
73
+ // 2) Growth: expand from the core through HAND-PAINTED, non-excluded cells
74
+ // (no radius cap). Generated terrain is NOT walkable, so a generated
75
+ // continent is never auto-claimed — only land the user hand-painted.
76
+ for (let head = 0; head < queue.length; head++) {
77
+ const [c, r] = queue[head];
78
+ const baseId = territory[cellKey(c, r)];
79
+ for (const [nc, nr] of [
80
+ [c + 1, r],
81
+ [c - 1, r],
82
+ [c, r + 1],
83
+ [c, r - 1],
84
+ ]) {
85
+ const k = cellKey(nc, nr);
86
+ if (k in territory)
87
+ continue;
88
+ if (!(k in handPaint))
89
+ continue; // only hand-painted land expands
90
+ if (exclude.has(cells[k]))
91
+ continue; // hand-painted wall (e.g. water)
92
+ territory[k] = baseId;
93
+ queue.push([nc, nr]);
94
+ }
95
+ }
96
+ return territory;
97
+ }
98
+ /**
99
+ * The derived territory (cellKey → baseId) for the whole board. Empty when there
100
+ * is no base-map or no base has a live beacon.
101
+ */
102
+ export function computeTerritory(store, tile, exclude) {
103
+ const base = findBaseMap(store);
104
+ if (!base || Object.keys(base.bases).length === 0)
105
+ return {};
106
+ const beacons = collectBeacons(store, base.bases);
107
+ if (beacons.length === 0)
108
+ return {};
109
+ const tilemap = findTilemap(store);
110
+ const cells = tilemap?.cells ?? EMPTY_CELLS;
111
+ const handPaint = tilemap?.handPaint ?? EMPTY_HAND_PAINT;
112
+ const t = tilemap?.tile ?? tile;
113
+ const sig = signature(beacons, exclude);
114
+ // Keyed by the `cells` object: it gets a fresh identity on every paint/generate
115
+ // commit, and `handPaint` always changes alongside it, so this stays correct.
116
+ let bySig = cache.get(cells);
117
+ if (!bySig) {
118
+ bySig = new Map();
119
+ cache.set(cells, bySig);
120
+ }
121
+ const cached = bySig.get(sig);
122
+ if (cached)
123
+ return cached;
124
+ const result = build(beacons, cells, handPaint, t, exclude);
125
+ bySig.set(sig, result);
126
+ return result;
127
+ }
128
+ //# sourceMappingURL=territory.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"territory.js","sourceRoot":"","sources":["../../src/base/territory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAW,eAAe,EAAa,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,KAAK,OAAO,EAAoC,MAAM,eAAe,CAAC;AAQ/E,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;CACb;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAOhG;AAED,iFAAiF;AACjF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAc9C;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAcxE;AAED,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,GAAG,EAAE,OAAO,CAAC;CACb;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,IAAI,CAoC9E"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAW,eAAe,EAAa,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,KAAK,OAAO,EAAoC,MAAM,eAAe,CAAC;AAQ/E,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;CACb;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAOhG;AAED,iFAAiF;AACjF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAc9C;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAcxE;AAED,MAAM,WAAW,eAAe;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,GAAG,EAAE,OAAO,CAAC;CACb;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,IAAI,CA0D9E"}
package/dist/generate.js CHANGED
@@ -66,10 +66,17 @@ export function generateIntoBox(deps, req) {
66
66
  const tile = shape.tile ?? deps.tile;
67
67
  const prev = { ...shape.cells };
68
68
  const next = { ...shape.cells };
69
+ // Generated cells are NOT hand-paint: clear the box from the hand-paint set so
70
+ // base territory won't expand through auto-generated terrain.
71
+ const prevHandPaint = { ...(shape.handPaint ?? {}) };
72
+ const nextHandPaint = { ...prevHandPaint };
69
73
  // Clear the target box, then lay down the generated field.
70
74
  for (let r = box.minR; r <= box.maxR; r++) {
71
- for (let c = box.minC; c <= box.maxC; c++)
72
- delete next[cellKey(c, r)];
75
+ for (let c = box.minC; c <= box.maxC; c++) {
76
+ const k = cellKey(c, r);
77
+ delete next[k];
78
+ delete nextHandPaint[k];
79
+ }
73
80
  }
74
81
  Object.assign(next, gen.generate({ box, seed: req.seed, params: req.params }));
75
82
  const prevBounds = cellsBounds(prev, tile);
@@ -77,14 +84,27 @@ export function generateIntoBox(deps, req) {
77
84
  if (created) {
78
85
  // Newly created this action: commit as an add so undo deletes it and redo
79
86
  // re-adds it (updateShape on a deleted id would no-op, breaking redo).
80
- const finalShape = { ...shape, cells: next, ...nextBounds };
87
+ const finalShape = {
88
+ ...shape,
89
+ cells: next,
90
+ handPaint: nextHandPaint,
91
+ ...nextBounds,
92
+ };
81
93
  deps.store.deleteShape(id);
82
94
  deps.commands.execute(createAddShapeCommand(deps.store, finalShape));
83
95
  }
84
96
  else {
85
97
  const command = {
86
- execute: () => deps.store.updateShape(id, { cells: next, ...nextBounds }),
87
- undo: () => deps.store.updateShape(id, { cells: prev, ...prevBounds }),
98
+ execute: () => deps.store.updateShape(id, {
99
+ cells: next,
100
+ handPaint: nextHandPaint,
101
+ ...nextBounds,
102
+ }),
103
+ undo: () => deps.store.updateShape(id, {
104
+ cells: prev,
105
+ handPaint: prevHandPaint,
106
+ ...prevBounds,
107
+ }),
88
108
  };
89
109
  deps.commands.execute(command);
90
110
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { PluginContext } from "@edv4h/usketch-shared";
2
+ /**
3
+ * Register every map control on the HUD. Returns a single teardown that unwinds
4
+ * all registrations (including the dynamically re-registered generator-params
5
+ * and active-base groups).
6
+ */
7
+ export declare function registerMapHud(ctx: PluginContext, tile: number): () => void;
8
+ //# sourceMappingURL=register-map-hud.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"register-map-hud.d.ts","sourceRoot":"","sources":["../../src/hud/register-map-hud.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAe,aAAa,EAAa,MAAM,uBAAuB,CAAC;AA6BnF;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,IAAI,CA+P3E"}
@@ -0,0 +1,269 @@
1
+ import { DEFAULT_BASE_RADIUS } from "../base/base-map-shape.js";
2
+ import { createBase, deleteBase, getBaseMap, resolveBaseMap } from "../base/base-ops.js";
3
+ import { baseStateStore } from "../base/base-state.js";
4
+ import { genStateStore } from "../gen-state.js";
5
+ import { generateIntoBox, viewportCellBox } from "../generate.js";
6
+ import { defaultParams, GENERATORS, GENERATORS_BY_ID } from "../generators/index.js";
7
+ import { ICON_CATEGORIES, ICONS } from "../icons.js";
8
+ import { TERRAINS } from "../terrain.js";
9
+ import { toolStateStore } from "../tool-state.js";
10
+ const MODE_OPTIONS = [
11
+ { value: "brush", label: "ブラシ" },
12
+ { value: "eraser", label: "消しゴム" },
13
+ { value: "fill", label: "塗りつぶし" },
14
+ { value: "region", label: "領域塗り" },
15
+ { value: "stamp", label: "アイコン" },
16
+ { value: "generate", label: "生成" },
17
+ { value: "base", label: "拠点" },
18
+ ];
19
+ const TERRAIN_OPTIONS = TERRAINS.map((t) => ({ value: t.key, label: t.name }));
20
+ const GEN_OPTIONS = GENERATORS.map((g) => ({ value: g.id, label: g.label }));
21
+ const CAT_LABEL = new Map(ICON_CATEGORIES.map((c) => [c.id, c.label]));
22
+ const ICON_OPTIONS = ICONS.map((i) => ({
23
+ value: i.key,
24
+ label: `${CAT_LABEL.get(i.category) ?? i.category} / ${i.ja}`,
25
+ }));
26
+ /**
27
+ * Register every map control on the HUD. Returns a single teardown that unwinds
28
+ * all registrations (including the dynamically re-registered generator-params
29
+ * and active-base groups).
30
+ */
31
+ export function registerMapHud(ctx, tile) {
32
+ const offs = [];
33
+ const deps = { store: ctx.store, commands: ctx.commands, tile };
34
+ // ── Mode / terrain / icon (bound to toolStateStore) ──
35
+ offs.push(ctx.hud.registerSettings({
36
+ id: "usketch-map:tool",
37
+ label: "RPG マップ操作",
38
+ fields: [
39
+ { name: "mode", label: "モード", type: "enum", options: MODE_OPTIONS },
40
+ { name: "terrain", label: "地形", type: "enum", options: TERRAIN_OPTIONS },
41
+ { name: "iconKey", label: "アイコン", type: "enum", options: ICON_OPTIONS },
42
+ ],
43
+ get: (name) => toolStateStore.get()[name],
44
+ set: (name, value) => toolStateStore.set({ [name]: value }),
45
+ subscribe: toolStateStore.subscribe,
46
+ }));
47
+ // ── Region-fill exclude: one boolean per terrain ──
48
+ offs.push(ctx.hud.registerSettings({
49
+ id: "usketch-map:region-exclude",
50
+ label: "領域塗り: 除外地形",
51
+ fields: TERRAINS.map((t) => ({ name: t.key, label: t.name, type: "boolean" })),
52
+ get: (name) => toolStateStore.get().excludeTerrains.includes(name),
53
+ set: (name, value) => {
54
+ const cur = toolStateStore.get().excludeTerrains;
55
+ const key = name;
56
+ const next = value
57
+ ? cur.includes(key)
58
+ ? cur
59
+ : [...cur, key]
60
+ : cur.filter((k) => k !== key);
61
+ toolStateStore.set({ excludeTerrains: next });
62
+ },
63
+ subscribe: toolStateStore.subscribe,
64
+ }));
65
+ // ── Generation: algorithm + seed, dynamic params, generate/regenerate ──
66
+ offs.push(ctx.hud.registerSettings({
67
+ id: "usketch-map:gen",
68
+ label: "マップ生成",
69
+ fields: [
70
+ { name: "algorithmId", label: "アルゴリズム", type: "enum", options: GEN_OPTIONS },
71
+ { name: "seed", label: "シード", type: "number", min: 0, step: 1 },
72
+ ],
73
+ get: (name) => genStateStore.get()[name],
74
+ set: (name, value) => {
75
+ if (name === "algorithmId") {
76
+ const g = GENERATORS_BY_ID.get(String(value));
77
+ if (g)
78
+ genStateStore.set({ algorithmId: g.id, params: defaultParams(g) });
79
+ }
80
+ else if (name === "seed") {
81
+ genStateStore.set({ seed: Number(value) >>> 0 });
82
+ }
83
+ },
84
+ subscribe: genStateStore.subscribe,
85
+ }));
86
+ // Dynamic generator params: re-register the fields whenever the algorithm changes.
87
+ let paramsOff = null;
88
+ let lastAlgo = "";
89
+ const syncParams = () => {
90
+ const algo = genStateStore.get().algorithmId;
91
+ if (algo === lastAlgo)
92
+ return;
93
+ lastAlgo = algo;
94
+ paramsOff?.();
95
+ paramsOff = null;
96
+ const gen = GENERATORS_BY_ID.get(algo);
97
+ if (!gen || gen.params.length === 0)
98
+ return;
99
+ const fields = gen.params.map((p) => ({
100
+ name: p.name,
101
+ label: p.label,
102
+ type: "number",
103
+ min: p.min,
104
+ max: p.max,
105
+ step: p.step,
106
+ }));
107
+ paramsOff = ctx.hud.registerSettings({
108
+ id: "usketch-map:gen-params",
109
+ label: "生成パラメータ",
110
+ fields,
111
+ get: (name) => genStateStore.get().params[name] ?? gen.params.find((p) => p.name === name)?.default ?? 0,
112
+ set: (name, value) => genStateStore.set({ params: { ...genStateStore.get().params, [name]: Number(value) } }),
113
+ subscribe: genStateStore.subscribe,
114
+ });
115
+ };
116
+ syncParams();
117
+ const offParamsSub = genStateStore.subscribe(syncParams);
118
+ offs.push(() => {
119
+ offParamsSub();
120
+ paramsOff?.();
121
+ });
122
+ const runGen = (box) => {
123
+ const g = genStateStore.get();
124
+ generateIntoBox(deps, {
125
+ generatorId: g.algorithmId,
126
+ seed: g.seed,
127
+ params: g.params,
128
+ box,
129
+ });
130
+ };
131
+ offs.push(ctx.actions.register({
132
+ id: "map:generate-view",
133
+ group: "マップ生成",
134
+ label: "ビュー全体に生成",
135
+ run: () => runGen(viewportCellBox(ctx.store, tile)),
136
+ }));
137
+ offs.push(ctx.actions.register({
138
+ id: "map:generate-regen",
139
+ group: "マップ生成",
140
+ label: "再生成",
141
+ isEnabled: () => !!genStateStore.get().lastBox,
142
+ run: () => {
143
+ const b = genStateStore.get().lastBox;
144
+ if (b)
145
+ runGen(b);
146
+ },
147
+ }));
148
+ // ── Base: create action + mode + dynamic active-base enum ──
149
+ offs.push(ctx.actions.register({
150
+ id: "map:base-create",
151
+ group: "拠点",
152
+ label: "拠点を作成",
153
+ params: [
154
+ { name: "name", label: "名前", type: "string" },
155
+ { name: "color", label: "色", type: "color", default: "#EF5350" },
156
+ ],
157
+ run: (args) => {
158
+ const count = Object.keys(getBaseMap(ctx.store)?.bases ?? {}).length;
159
+ const name = String(args.name ?? "").trim() || `拠点${count + 1}`;
160
+ const id = createBase(deps, name, String(args.color ?? "#EF5350"));
161
+ baseStateStore.set({ activeBaseId: id });
162
+ },
163
+ }));
164
+ offs.push(ctx.actions.register({
165
+ id: "map:base-delete",
166
+ group: "拠点",
167
+ label: "アクティブ拠点を削除",
168
+ isEnabled: () => {
169
+ const active = baseStateStore.get().activeBaseId;
170
+ return !!active && !!getBaseMap(ctx.store)?.bases[active];
171
+ },
172
+ run: () => {
173
+ const active = baseStateStore.get().activeBaseId;
174
+ if (!active)
175
+ return;
176
+ deleteBase(deps, active);
177
+ const remaining = Object.keys(getBaseMap(ctx.store)?.bases ?? {});
178
+ baseStateStore.set({ activeBaseId: remaining[0] ?? null });
179
+ },
180
+ }));
181
+ // Beacon: territory radius of the ACTIVE base (edited live → territory follows).
182
+ const subBaseAndStore = (cb) => {
183
+ const u1 = baseStateStore.subscribe(cb);
184
+ const u2 = ctx.store.subscribe(cb);
185
+ return () => {
186
+ u1();
187
+ u2();
188
+ };
189
+ };
190
+ offs.push(ctx.hud.registerSettings({
191
+ id: "usketch-map:base-radius",
192
+ label: "拠点: 半径(マス)",
193
+ fields: [{ name: "radius", label: "半径", type: "number", min: 1, max: 64, step: 1 }],
194
+ get: () => {
195
+ const active = baseStateStore.get().activeBaseId;
196
+ const bases = getBaseMap(ctx.store)?.bases;
197
+ return (active && bases?.[active]?.radius) || DEFAULT_BASE_RADIUS;
198
+ },
199
+ set: (_name, value) => {
200
+ const active = baseStateStore.get().activeBaseId;
201
+ if (!active)
202
+ return;
203
+ const { id } = resolveBaseMap(ctx.store, tile);
204
+ const shape = ctx.store.getShape(id);
205
+ const base = shape?.bases[active];
206
+ if (!shape || !base)
207
+ return;
208
+ const radius = Math.max(1, Math.round(Number(value)));
209
+ const nextBases = { ...shape.bases, [active]: { ...base, radius } };
210
+ ctx.store.updateShape(id, { bases: nextBases });
211
+ },
212
+ subscribe: subBaseAndStore,
213
+ }));
214
+ offs.push(ctx.hud.registerSettings({
215
+ id: "usketch-map:base-exclude",
216
+ label: "拠点: 除外地形(壁)",
217
+ fields: TERRAINS.map((t) => ({ name: t.key, label: t.name, type: "boolean" })),
218
+ get: (name) => baseStateStore.get().excludeTerrains.includes(name),
219
+ set: (name, value) => {
220
+ const cur = baseStateStore.get().excludeTerrains;
221
+ const key = name;
222
+ const next = value
223
+ ? cur.includes(key)
224
+ ? cur
225
+ : [...cur, key]
226
+ : cur.filter((k) => k !== key);
227
+ baseStateStore.set({ excludeTerrains: next });
228
+ },
229
+ subscribe: baseStateStore.subscribe,
230
+ }));
231
+ // Active base: re-register the enum options whenever the set of bases changes.
232
+ let baseOff = null;
233
+ let lastBaseSig = "";
234
+ const syncBases = () => {
235
+ const bases = getBaseMap(ctx.store)?.bases ?? {};
236
+ const sig = Object.keys(bases).sort().join(",");
237
+ if (sig === lastBaseSig)
238
+ return;
239
+ lastBaseSig = sig;
240
+ baseOff?.();
241
+ const options = Object.entries(bases).map(([id, info]) => ({ value: id, label: info.name }));
242
+ baseOff = ctx.hud.registerSettings({
243
+ id: "usketch-map:active-base",
244
+ label: "拠点: アクティブ",
245
+ fields: [
246
+ {
247
+ name: "activeBaseId",
248
+ label: "拠点",
249
+ type: "enum",
250
+ options: options.length ? options : [{ value: "", label: "(未作成)" }],
251
+ },
252
+ ],
253
+ get: () => baseStateStore.get().activeBaseId ?? "",
254
+ set: (_name, value) => baseStateStore.set({ activeBaseId: String(value) || null }),
255
+ subscribe: baseStateStore.subscribe,
256
+ });
257
+ };
258
+ syncBases();
259
+ const offBaseSub = ctx.store.subscribe(syncBases);
260
+ offs.push(() => {
261
+ offBaseSub();
262
+ baseOff?.();
263
+ });
264
+ return () => {
265
+ for (const off of offs)
266
+ off();
267
+ };
268
+ }
269
+ //# sourceMappingURL=register-map-hud.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"register-map-hud.js","sourceRoot":"","sources":["../../src/hud/register-map-hud.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
- export { BASE_MAP_TYPE, type BaseInfo, type BaseMapShapeData, type OwnerMap, } from "./base/base-map-shape.js";
1
+ export { BASE_MAP_TYPE, type BaseInfo, type BaseMapShapeData, } from "./base/base-map-shape.js";
2
+ export { computeTerritory, type Territory } from "./base/territory.js";
2
3
  export { GENERATORS, type GenContext, type GenParam, type MapGenerator, } from "./generators/index.js";
3
4
  export { ICONS, type IconCategory, type IconDef } from "./icons.js";
4
5
  export { MAP_ICON_TYPE, type MapIconShapeData } from "./map-icon-shape.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EACb,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,QAAQ,GACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACN,UAAU,EACV,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,YAAY,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EACN,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,iBAAiB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EACb,KAAK,QAAQ,EACb,KAAK,gBAAgB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EACN,UAAU,EACV,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,YAAY,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EACN,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,iBAAiB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC"}
package/dist/index.js CHANGED
@@ -1,4 +1,5 @@
1
1
  export { BASE_MAP_TYPE, } from "./base/base-map-shape.js";
2
+ export { computeTerritory } from "./base/territory.js";
2
3
  export { GENERATORS, } from "./generators/index.js";
3
4
  export { ICONS } from "./icons.js";
4
5
  export { MAP_ICON_TYPE } from "./map-icon-shape.js";