@logic-pad/core 0.17.0 → 0.18.0

package/assets/logic-core.global.d.ts

@@ -3083,9 +3083,10 @@ declare global {
     }): this;
     withRevealLocation(revealLocation: boolean): this;
   }
-  export declare class HouseSymbol extends Symbol$1 {
+  export declare class HouseSymbol extends NumberSymbol {
     readonly x: number;
     readonly y: number;
+    readonly number: number;
     readonly title = 'House';
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
@@ -3094,14 +3095,26 @@ declare global {
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x: number, y: number);
+    constructor(x: number, y: number, number: number);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    validateSymbol(grid: GridData): State;
-    copyWith({ x, y }: { x?: number; y?: number }): this;
+    countTiles(grid: GridData): {
+      completed: number;
+      possible: number;
+    };
+    copyWith({
+      x,
+      y,
+      number,
+    }: {
+      x?: number;
+      y?: number;
+      number?: number;
+    }): this;
   }
   export declare const allSymbols: Map<string, Symbol$1>;
   export declare function aggregateState(

package/dist/data/symbols/houseSymbol.d.ts

@@ -1,10 +1,10 @@
 import { AnyConfig } from '../config.js';
 import GridData from '../grid.js';
-import { State } from '../primitives.js';
-import Symbol from './symbol.js';
-export default class HouseSymbol extends Symbol {
+import NumberSymbol from './numberSymbol.js';
+export default class HouseSymbol extends NumberSymbol {
     readonly x: number;
     readonly y: number;
+    readonly number: number;
     readonly title = "House";
     private static readonly CONFIGS;
     private static readonly EXAMPLE_GRID;
@@ -13,16 +13,21 @@ export default class HouseSymbol extends Symbol {
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x: number, y: number);
+    constructor(x: number, y: number, number: number);
     get id(): string;
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    validateSymbol(grid: GridData): State;
-    copyWith({ x, y }: {
+    countTiles(grid: GridData): {
+        completed: number;
+        possible: number;
+    };
+    copyWith({ x, y, number, }: {
         x?: number;
         y?: number;
+        number?: number;
     }): this;
 }
 export declare const instance: HouseSymbol;

package/dist/data/symbols/houseSymbol.js

@@ -1,17 +1,18 @@
 import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
 import { array } from '../dataHelper.js';
-import { Color, State } from '../primitives.js';
-import Symbol from './symbol.js';
-class HouseSymbol extends Symbol {
+import { Color } from '../primitives.js';
+import NumberSymbol from './numberSymbol.js';
+class HouseSymbol extends NumberSymbol {
     /**
      * **Houses must connect to exactly one other house**
      *
      * @param x - The x-coordinate of the symbol.
      * @param y - The y-coordinate of the symbol.
+     * @param number - The number of houses in this region.
      */
-    constructor(x, y) {
-        super(x, y);
+    constructor(x, y, number) {
+        super(x, y, number);
         Object.defineProperty(this, "x", {
             enumerable: true,
             configurable: true,
@@ -24,6 +25,12 @@ class HouseSymbol extends Symbol {
             writable: true,
             value: y
         });
+        Object.defineProperty(this, "number", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: number
+        });
         Object.defineProperty(this, "title", {
             enumerable: true,
             configurable: true,
@@ -35,7 +42,7 @@ class HouseSymbol extends Symbol {
         return `house`;
     }
     get explanation() {
-        return '*Houses* must connect to *exactly one* other house';
+        return '*House numbers* count the number of houses in the region';
     }
     get configs() {
         return HouseSymbol.CONFIGS;
@@ -43,45 +50,39 @@ class HouseSymbol extends Symbol {
     createExampleGrid() {
         return HouseSymbol.EXAMPLE_GRID;
     }
-    validateSymbol(grid) {
+    countTiles(grid) {
         const thisX = Math.floor(this.x);
         const thisY = Math.floor(this.y);
-        let complete = true;
         const visited = array(grid.width, grid.height, () => false);
         const connected = array(grid.width, grid.height, () => false);
         const color = grid.getTile(thisX, thisY).color;
-        grid.iterateArea({ x: thisX, y: thisY }, tile => color === Color.Gray ||
-            tile.color === Color.Gray ||
-            tile.color === color, (tile, x, y) => {
+        if (color === Color.Gray)
+            return { completed: 0, possible: Number.MAX_SAFE_INTEGER };
+        grid.iterateArea({ x: thisX, y: thisY }, tile => tile.color === Color.Gray || tile.color === color, (_, x, y) => {
             visited[y][x] = true;
-            if (tile.color === Color.Gray)
-                complete = false;
         });
         grid.iterateArea({ x: thisX, y: thisY }, tile => tile.color === color, (_, x, y) => {
             connected[y][x] = true;
         });
-        let connectedHouses = 0;
+        let completedHouses = 0;
         let possibleHouses = 0;
         for (const symbol of grid.symbols.get(this.id) ?? []) {
-            if (symbol !== this && symbol instanceof HouseSymbol) {
+            if (symbol instanceof HouseSymbol) {
                 const symbolX = Math.floor(symbol.x);
                 const symbolY = Math.floor(symbol.y);
                 if (connected[symbolY][symbolX])
-                    connectedHouses++;
+                    completedHouses++;
                 else if (visited[symbolY][symbolX])
                     possibleHouses++;
             }
         }
-        if (color !== Color.Gray &&
-            (connectedHouses > 1 || connectedHouses + possibleHouses < 1)) {
-            return State.Error;
-        }
-        return complete || (connectedHouses === 1 && possibleHouses === 0)
-            ? State.Satisfied
-            : State.Incomplete;
+        return {
+            completed: completedHouses,
+            possible: completedHouses + possibleHouses,
+        };
     }
-    copyWith({ x, y }) {
-        return new HouseSymbol(x ?? this.x, y ?? this.y);
+    copyWith({ x, y, number, }) {
+        return new HouseSymbol(x ?? this.x, y ?? this.y, number ?? this.number);
     }
 }
 Object.defineProperty(HouseSymbol, "CONFIGS", {
@@ -103,6 +104,14 @@ Object.defineProperty(HouseSymbol, "CONFIGS", {
             description: 'Y',
             configurable: false,
         },
+        {
+            type: ConfigType.Number,
+            default: 2,
+            field: 'number',
+            description: 'Number',
+            explanation: 'Number of houses in this region',
+            configurable: true,
+        },
     ])
 });
 Object.defineProperty(HouseSymbol, "EXAMPLE_GRID", {
@@ -110,12 +119,12 @@ Object.defineProperty(HouseSymbol, "EXAMPLE_GRID", {
     configurable: true,
     writable: true,
     value: Object.freeze(GridData.create(['bbbww', 'wwwbw', 'wbbbw', 'wwwww'])
-        .addSymbol(new HouseSymbol(0, 0))
-        .addSymbol(new HouseSymbol(2, 0))
-        .addSymbol(new HouseSymbol(3, 0))
-        .addSymbol(new HouseSymbol(2, 1))
-        .addSymbol(new HouseSymbol(3, 1))
-        .addSymbol(new HouseSymbol(1, 2)))
+        .addSymbol(new HouseSymbol(0, 0, 2))
+        .addSymbol(new HouseSymbol(2, 0, 2))
+        .addSymbol(new HouseSymbol(3, 0, 2))
+        .addSymbol(new HouseSymbol(2, 1, 2))
+        .addSymbol(new HouseSymbol(3, 1, 2))
+        .addSymbol(new HouseSymbol(1, 2, 2)))
 });
 export default HouseSymbol;
-export const instance = new HouseSymbol(0, 0);
+export const instance = new HouseSymbol(0, 0, 2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "type": "module",
   "files": [
     "dist",