@adatechnology/game-urban 0.3.0 → 0.3.1

package/dist/index.d.ts

@@ -539,7 +539,10 @@ type PoleOptions = {
     /** Adds the transformer drum (single arm). */
     transformer?: boolean;
 };
-type PoleShapeBuilder = (b: UrbanBuilder, spec: any, o: PoleOptions) => void;
+/** Draws a pole from its `spec`. Declared as a method so the registry can hold each builder with its own spec type (the `PoleDef` names the builder that reads its spec). */
+type PoleShapeBuilder<TSpec extends object = object> = {
+    build(b: UrbanBuilder, spec: TSpec, o: PoleOptions): void;
+}['build'];
 type PoleDef = {
     id: string;
     /** Key of the shape builder that reads `spec`. */
@@ -926,7 +929,13 @@ type ComposeContext<TParams = Record<string, unknown>> = {
         shop?: number;
     }): void;
 };
-type Composer<TParams = any> = (context: ComposeContext<TParams>) => void;
+/**
+ * Draws a pattern from its params. Declared as a method so a registry of composers can hold each with its own params type
+ * (the pattern that names the composer carries the matching params).
+ */
+type Composer<TParams = Record<string, unknown>> = {
+    compose(context: ComposeContext<TParams>): void;
+}['compose'];
 type ComposeOptions = {
     locale?: Locale;
     providers?: Providers;
@@ -1134,9 +1143,9 @@ type Origin = {
     z: number;
 };
 /** Draws one pattern at `origin`: its composer, then the board with the title and the caption. */
-declare function composePattern(kit: UrbanKitCore, pattern: NeighbourhoodPattern<any>, composer: Composer, b: UrbanBuilder, origin: Origin, options?: ComposeOptions): UrbanPlan;
+declare function composePattern(kit: UrbanKitCore, pattern: NeighbourhoodPattern, composer: Composer, b: UrbanBuilder, origin: Origin, options?: ComposeOptions): UrbanPlan;
 /** The marker (map pin) of a pattern at an origin: where it stands, how high, and what it says. */
-declare function patternMarker(pattern: NeighbourhoodPattern<any>, origin: Origin, locale?: Locale): {
+declare function patternMarker(pattern: NeighbourhoodPattern, origin: Origin, locale?: Locale): {
     x: number;
     y: number;
     z: number;
@@ -1196,14 +1205,14 @@ type UrbanOptions = {
     /** Entries added to the catalogues (an entry with an existing id replaces it). */
     packs?: {
         poles?: readonly PoleDef[];
-        neighbourhoods?: readonly NeighbourhoodPattern<any>[];
+        neighbourhoods?: readonly NeighbourhoodPattern[];
         districtKinds?: readonly DistrictKindDef[];
         cityPlans?: readonly CityPlanInput[];
     };
     /** Numbers changed on shipped entries, by id (objects merge, arrays replace). */
     patch?: {
         poles?: Record<string, DeepPartial<PoleDef>>;
-        neighbourhoods?: Record<string, DeepPartial<NeighbourhoodPattern<any>>>;
+        neighbourhoods?: Record<string, DeepPartial<NeighbourhoodPattern>>;
         districtKinds?: Record<string, DeepPartial<DistrictKindDef>>;
         cityPlans?: Record<string, DeepPartial<CityPlanInput>>;
     };
@@ -1277,7 +1286,7 @@ declare function createUrban(options?: UrbanOptions): {
     neighbourhoods: {
         ids: () => string[];
         get(id: string): {
-            pattern: NeighbourhoodPattern<any>;
+            pattern: NeighbourhoodPattern;
             /** Draws the pattern at `origin` and gives back what it put there. */
             compose: (b: UrbanBuilder, origin: Origin, o?: ComposeOptions) => UrbanPlan;
             marker: (origin: Origin, locale?: Locale) => {
@@ -1768,7 +1777,7 @@ declare const DEFAULT_PLANT_CONTEXTS: Readonly<Record<PlantRequest['kind'], stri
 declare function createPlantProvider(options?: PlantProviderOptions): PlantProvider;
 
 /** The ten patterns of the Galeria's sample sheet, in the order the page builds them. */
-declare const DEFAULT_PATTERNS: readonly NeighbourhoodPattern<any>[];
+declare const DEFAULT_PATTERNS: readonly NeighbourhoodPattern[];
 /** Where the sample sheet puts each pattern: a 3 x 3 grid 80 by 56 m apart, and the military cell off to the east. */
 declare const SAMPLE_CELLS: Readonly<Record<string, {
     x: number;
@@ -1776,7 +1785,7 @@ declare const SAMPLE_CELLS: Readonly<Record<string, {
 }>>;
 
 /** The patterns of the tower pack. */
-declare const TOWER_PATTERNS: readonly NeighbourhoodPattern<any>[];
+declare const TOWER_PATTERNS: readonly NeighbourhoodPattern[];
 /** Where the sample sheet puts them (pass it as `cells`). */
 declare const TOWER_SAMPLE_CELLS: Readonly<Record<string, {
     x: number;

package/dist/index.global.js

@@ -650,6 +650,7 @@ var GameUrban = (() => {
   var MAX_CANDIDATES = 80;
   function carCandidates(slot, item, car) {
     const front = [slot.frontU, slot.frontV];
+    if (!slot._cell) throw new Error("Slot without a cell: " + slot.id);
     const zone = slot._cell.R;
     const alongV = Math.abs(front[1]) === 1;
     const [extentU, extentV] = extent([item.w, item.d], front);
@@ -869,6 +870,7 @@ var GameUrban = (() => {
   }
   function itemRect(slot, it, shift) {
     const c = slot._cell;
+    if (!c) throw new Error("Slot without a cell: " + slot.id);
     const f = c.f;
     const [extentU, extentV] = extent([it.w, it.d], f);
     const R = c.R;
@@ -973,7 +975,7 @@ var GameUrban = (() => {
         if (!parent) return null;
         for (const { it } of cands) {
           if (it.w > parent.w + EPS || it.d > parent.d + EPS) continue;
-          const f = [parent.frontU, parent.frontV];
+          const f = [parent.frontU ?? 0, parent.frontV ?? 1];
           const r = parent.aabb;
           const [extentU, extentV] = extent([it.w, it.d], f);
           const cu = (r[0] + r[2]) / 2 - f[0] * (parent.d / 2 - it.d / 2);
@@ -1007,7 +1009,7 @@ var GameUrban = (() => {
           if (!car && !relax && s.clearance > 0 && !it.low) {
             cl2 = clearRect(r3, f, s.clearance);
             if (!insideUnion(cl2, inners)) continue;
-            if (items.some((m2) => !m2.low && !m2.flat && !m2.on && overlaps(cl2, m2._r))) continue;
+            if (items.some((m2) => !m2.low && !m2.flat && !m2.on && overlaps(cl2, m2._r ?? m2.aabb))) continue;
           }
           if (!it.low && reserves.some((q) => overlaps(r3, q))) continue;
           let rimRect2 = null;
@@ -1191,7 +1193,7 @@ var GameUrban = (() => {
           if (!(opts.without && opts.without(r))) return r;
           continue;
         }
-        if (occupied.some((m) => !m.low && !m.flat && !m.on && !m.decor && m.clearance > 0 && overlaps(r, clearRect(m._r, [m.frontU, m.frontV], m.clearance)))) continue;
+        if (occupied.some((m) => !m.low && !m.flat && !m.on && !m.decor && (m.clearance ?? 0) > 0 && overlaps(r, clearRect(m._r, [m.frontU ?? 0, m.frontV ?? 1], m.clearance ?? 0)))) continue;
         if (opts.without && opts.without(r)) continue;
         if (!reachable(opts.railing || gridOf(room), solidList.concat([r]), room.outdoor ? 0.16 : plan.playerRadius)) continue;
         return r;
@@ -1452,7 +1454,7 @@ var GameUrban = (() => {
     const far = m.built / area;
     if (far > zone.maxFar + 1e-9) out.push({ rule: "far", actual: r2(far), limit: zone.maxFar });
     let permeable = 0;
-    for (const z of lot.zones) if (registries().PERMEABLE_GROUNDS.has(z.ground)) for (const p of z.parts) permeable += (p[2] - p[0]) * (p[3] - p[1]);
+    for (const z of lot.zones) if (z.ground && registries().PERMEABLE_GROUNDS.has(z.ground)) for (const p of z.parts) permeable += (p[2] - p[0]) * (p[3] - p[1]);
     const permeability = permeable / area;
     if (permeability < zone.permeableMin - 1e-9) out.push({ rule: "permeable", actual: r2(permeability), limit: zone.permeableMin });
     return out;
@@ -1495,12 +1497,12 @@ var GameUrban = (() => {
     const [u0, v0, u1, v1] = lot.rect;
     const area = (u1 - u0) * (v1 - v0);
     const areaOfZone = (z) => z.parts.reduce((s, p) => s + (p[2] - p[0]) * (p[3] - p[1]), 0);
-    let permeable = zones.filter((z) => registries().PERMEABLE_GROUNDS.has(z.ground)).reduce((s, z) => s + areaOfZone(z), 0);
+    let permeable = zones.filter((z) => z.ground != null && registries().PERMEABLE_GROUNDS.has(z.ground)).reduce((s, z) => s + areaOfZone(z), 0);
     if (permeable / area >= zone.permeableMin) return;
-    const candidates = zones.filter((z) => ADJUSTABLE_ZONES.has(z.type) && !registries().PERMEABLE_GROUNDS.has(z.ground)).sort((a, b) => areaOfZone(b) - areaOfZone(a));
+    const candidates = zones.filter((z) => ADJUSTABLE_ZONES.has(z.type) && !(z.ground != null && registries().PERMEABLE_GROUNDS.has(z.ground))).sort((a, b) => areaOfZone(b) - areaOfZone(a));
     for (const z of candidates) {
       if (permeable / area >= zone.permeableMin) break;
-      adjustments.push({ field: "ground:" + z.id, from: z.ground, to: target, reason: "permeable_min" });
+      adjustments.push({ field: "ground:" + z.id, from: z.ground ?? "", to: target, reason: "permeable_min" });
       z.ground = target;
       permeable += areaOfZone(z);
     }
@@ -1767,9 +1769,9 @@ var GameUrban = (() => {
         height: type === "pedestrian" ? style.height : Math.min(style.height, 2.2),
         side,
         to: toTarget || null,
-        material: "iron"
+        material: "iron",
+        zones: openingZones(u, v, "u", width, openingDepth(width, type === "pedestrian" ? width : 0))
       };
-      g.zones = openingZones(u, v, "u", width, openingDepth(width, type === "pedestrian" ? width : 0));
       gates.push(g);
       return g;
     };
@@ -2052,7 +2054,7 @@ var GameUrban = (() => {
     };
     const invalid = (m) => Object.assign(base, { valid: false, reason: m, x: 0, z: 0, ry: 0, w: 0, d: 0, frontU: 0, frontV: 1, aabb: [0, 0, 0, 0], _cell: null });
     if (def.anchor === "on" || def.anchor === "inside") {
-      const parent = byId2[def.parent];
+      const parent = def.parent ? byId2[def.parent] : void 0;
       if (!parent || !parent.valid) return invalid("invalid_parent");
       return Object.assign(base, { x: parent.x, z: parent.z, ry: parent.ry, w: parent.w, d: parent.d, frontU: parent.frontU, frontV: parent.frontV, aabb: parent.aabb, _cell: parent._cell });
     }
@@ -2093,9 +2095,10 @@ var GameUrban = (() => {
         const windowList = windowsOfRoom(plan, room);
         win = windowList[def.n];
         if (!win) return invalid("no_window");
+        const found2 = win;
         side = room.outdoor ? SIDE_OPPOSITE[win.side] : WINDOW_SIDE[win.side];
         const cand = room.parts.map(inner).find(
-          (r) => (win.axis === "u" ? win.u >= r[0] - TOL && win.u <= r[2] + TOL : win.v >= r[1] - TOL && win.v <= r[3] + TOL) && (side === "left" && eq(r[0], win.pos + MARGIN) || side === "right" && eq(r[2], win.pos - MARGIN) || side === "front" && eq(r[1], win.pos + MARGIN) || side === "back" && eq(r[3], win.pos - MARGIN))
+          (r) => (found2.axis === "u" ? found2.u >= r[0] - TOL && found2.u <= r[2] + TOL : found2.v >= r[1] - TOL && found2.v <= r[3] + TOL) && (side === "left" && eq(r[0], found2.pos + MARGIN) || side === "right" && eq(r[2], found2.pos - MARGIN) || side === "front" && eq(r[1], found2.pos + MARGIN) || side === "back" && eq(r[3], found2.pos - MARGIN))
         );
         if (!cand) return invalid("window_outside_room");
         R = cand;
@@ -2287,7 +2290,7 @@ var GameUrban = (() => {
       if (m.category) out.color = colorOf(m, seed);
       return out;
     });
-    const result = {
+    const base = {
       template: tpl.id,
       name: translate("templates", tpl.id, locale),
       use: useOf(tpl),
@@ -2324,8 +2327,8 @@ var GameUrban = (() => {
       building: tpl.building ? tpl.building(plan.w, plan.d, op) : null,
       missing
     };
-    if (tpl.singleFloor) result.floorNumber = op.floor || 3;
-    result.partyWalls = tpl.partyWalls || [];
+    if (tpl.singleFloor) base.floorNumber = op.floor || 3;
+    const result = Object.assign(base, { partyWalls: tpl.partyWalls || [] });
     if (plan.config) result.config = plan.config;
     runResultExtensions(plan, result, seed, op);
     if (zone) {
@@ -13533,6 +13536,7 @@ var GameUrban = (() => {
         hood: true
       },
       function(c) {
+        c.meta.armor = "III";
         const f = 3.75, W = 2.32, len = 1.85, ax = 2.5, wr = 0.506, ww = 0.28, col = "#56616b";
         c.meta.bullet = true;
         c.meta.cabLength = len + 0.15;