@adatechnology/game-floorplan-structure 2.0.0 → 2.0.1

package/dist/index.js

@@ -947,9 +947,10 @@ function addRoof(context) {
 }
 
 // src/structure/stairs.ts
+var isStair = (item) => item.category === "stairs" && typeof item.link === "object" && item.link !== null;
 function flightsOf(items) {
   const flights = /* @__PURE__ */ new Map();
-  for (const item of items.filter((it) => it.category === "stairs" && it.link)) {
+  for (const item of items.filter(isStair)) {
     const key = `${item.link.from}_${item.link.to}`;
     if (!flights.has(key) || item.floor === item.link.from) flights.set(key, item);
   }
@@ -1527,12 +1528,12 @@ function placeEntrance(layout) {
     const rect = lot.rect;
     const poleU = clamp(gate ? gate.u + 3 : plan.w / 2, rect[0] + 0.5, rect[2] - 0.5);
     const poleV = rect[1] - 0.6;
-    let meter;
+    let placed;
     if (gate) {
       const direction = gate.u - gate.width / 2 - 0.4 >= rect[0] + 0.3 ? -1 : 1;
-      meter = { place: "gate_pillar", u: round22(gate.u + direction * (gate.width / 2 + 0.25)), v: round22(gate.v), y: 1.4, side: "front", ...METER_SIZE };
-    } else meter = { place: "facade", u: round22(door ? door.at + 1.2 : plan.w / 2), v: -0.1, y: 1.4, side: "front", ...METER_SIZE };
-    meter.id = "meter";
+      placed = { place: "gate_pillar", u: round22(gate.u + direction * (gate.width / 2 + 0.25)), v: round22(gate.v), y: 1.4, side: "front", ...METER_SIZE };
+    } else placed = { place: "facade", u: round22(door ? door.at + 1.2 : plan.w / 2), v: -0.1, y: 1.4, side: "front", ...METER_SIZE };
+    const meter = Object.assign(placed, { id: "meter" });
     electrical.serviceEntrance = { pole: { u: round22(poleU), v: round22(poleV), h: 7.5 }, drop: [[round22(poleU), round22(poleV), 6.5], [meter.u, meter.v, 2.6]], meter, descent: [[meter.u, meter.v, 2.6], [meter.u, meter.v, 1.65]], internalRun: null };
   } else if (lot === null || plan.style === "commercial") {
     const front = door ? { u: round22(door.at + 1), v: -0.1 } : { u: round22(plan.w / 2), v: -0.1 };
@@ -1566,7 +1567,8 @@ function placePanel(layout) {
   }
   if (electrical.serviceEntrance && electrical.panel) {
     const entrance = electrical.serviceEntrance;
-    entrance.internalRun = [[entrance.meter.u, entrance.meter.v, 0.1], [electrical.panel.u, electrical.panel.v, heightOf(plan, electrical.panel.floor, electrical.panel.y)]];
+    const meterOf = entrance.meter;
+    entrance.internalRun = [[meterOf.u, meterOf.v, 0.1], [electrical.panel.u, electrical.panel.v, heightOf(plan, electrical.panel.floor, electrical.panel.y)]];
   }
 }
 
@@ -1655,9 +1657,9 @@ function planElectrical(context) {
   placePanel(layout);
   addSwitches(layout);
   addConduits(layout);
-  if (mode === "tap" && electrical.serviceEntrance?.meter) {
-    const entrance = electrical.serviceEntrance;
-    const meter = entrance.meter;
+  const entrance = electrical.serviceEntrance;
+  const meter = entrance?.meter;
+  if (mode === "tap" && entrance && meter) {
     entrance.tap = true;
     entrance.connection = { u: meter.u, v: meter.v, y: 2.6 };
     entrance.meter = null;
@@ -1688,11 +1690,11 @@ function placeMeter(plan) {
   };
 }
 function besideStove(context, stove, room, solids, doorZones) {
-  const t = [-stove.frontV, stove.frontU];
+  const t = [-(stove.frontV ?? 1), stove.frontU ?? 0];
   const parts = room.parts.map(inner);
   for (const s of context.rng() < 0.5 ? [1, -1] : [-1, 1]) {
-    const cx = stove.x + t[0] * s * (stove.w / 2 + CYLINDER.w / 2 + 0.03) - stove.frontU * (stove.d - CYLINDER.d) / 2;
-    const cz = stove.z + t[1] * s * (stove.w / 2 + CYLINDER.w / 2 + 0.03) - stove.frontV * (stove.d - CYLINDER.d) / 2;
+    const cx = stove.x + t[0] * s * (stove.w / 2 + CYLINDER.w / 2 + 0.03) - (stove.frontU ?? 0) * (stove.d - CYLINDER.d) / 2;
+    const cz = stove.z + t[1] * s * (stove.w / 2 + CYLINDER.w / 2 + 0.03) - (stove.frontV ?? 1) * (stove.d - CYLINDER.d) / 2;
     const rect = [cx - CYLINDER.w / 2, cz - CYLINDER.d / 2, cx + CYLINDER.w / 2, cz + CYLINDER.d / 2].map(round22);
     const inside = parts.some((q) => rect[0] >= q[0] - 0.011 && rect[2] <= q[2] + 0.011 && rect[1] >= q[1] - 0.011 && rect[3] <= q[3] + 0.011);
     if (inside && !solids.some((o) => overlaps(rect, o, 0.011)) && !doorZones.some((z) => overlaps(rect, z, 0.011))) return { mode: "beside", x: cx, z: cz, rect };
@@ -1748,8 +1750,8 @@ function cylinderItem(stove, spot) {
     d: CYLINDER.d,
     h: CYLINDER.h,
     y: 0,
-    frontU: -stove.frontU,
-    frontV: -stove.frontV,
+    frontU: -(stove.frontU ?? 0),
+    frontV: -(stove.frontV ?? 1),
     room: stove.room,
     floor: stove.floor,
     outdoor: !!spot.outdoor,
@@ -2009,9 +2011,11 @@ function planOutbuildings(context) {
   for (const item of items.filter((m) => m.category === "outbuilding")) {
     const rng = context.rngFor(streamOf(item.id));
     const [a0, a1, a2, a3] = item.aabb;
-    const n = [item.frontU, item.frontV];
-    const t = [-item.frontV, item.frontU];
-    const horizontal = Math.abs(item.frontU) === 1;
+    const frontU = item.frontU ?? 0;
+    const frontV = item.frontV ?? 1;
+    const n = [frontU, frontV];
+    const t = [-frontV, frontU];
+    const horizontal = Math.abs(frontU) === 1;
     const cx = (a0 + a2) / 2;
     const cz = (a1 + a3) / 2;
     const depth = horizontal ? a2 - a0 : a3 - a1;
@@ -2248,7 +2252,7 @@ function constructionExtension(context) {
 }
 function structureExtension(context) {
   const cache = cacheOf(context.result);
-  const options = { construction: cache.build.construction, extras: cache.build.extras ?? {}, tank: context.result.waterTank ?? null, wallDetail: context.options.wallDetail ?? "panels" };
+  const options = { construction: cache.build.construction, extras: cache.build.extras ?? {}, tank: tankOf(context), wallDetail: context.options.wallDetail ?? "panels" };
   const { roof, ...structure } = buildStructure(context.result, options);
   cache.roof = roof;
   for (const part of structure.parts) {
@@ -2259,6 +2263,7 @@ function structureExtension(context) {
   return structure;
 }
 var COOKING_CYLINDER = { type: "cooking_gas_cylinder", category: "cooking_gas_cylinder", w: 0.36, d: 0.36, h: 0.48 };
+var tankOf = (context) => context.result.waterTank ?? null;
 function energyOf(context) {
   const energy = context.plan.tpl.energy;
   return typeof energy === "function" ? energy(context.options, context.plan.w, context.plan.d) : void 0;
@@ -2289,7 +2294,7 @@ function register(engine, options = {}) {
     if (context.result.lot) addOutbuildingPaths(context.result.lot, outbuildings, context.result.items);
     return outbuildings;
   }, { after: ["contents"] });
-  engine.registerResultExtension("utilities", (context) => planUtilities({ plan: context.plan, items: context.result.items, stateItems: context.result.stateItems, tank: context.result.waterTank ?? null, ...energyOf(context) ? { energy: energyOf(context) } : {}, rngFor: (key) => engine.createRng(context.seed, key) }), { after: ["outbuildings", "waterTank"] });
+  engine.registerResultExtension("utilities", (context) => planUtilities({ plan: context.plan, items: context.result.items, stateItems: context.result.stateItems, tank: tankOf(context), ...energyOf(context) ? { energy: energyOf(context) } : {}, rngFor: (key) => engine.createRng(context.seed, key) }), { after: ["outbuildings", "waterTank"] });
 }
 
 // src/to-destructible-spec.ts