@pompidup/kingdomino-engine 3.5.0 → 3.5.1

package/dist/index.universal.js

@@ -5447,19 +5447,11 @@ var placeDomino = (kingdom, position, rotation, domino, maxKingdomSize = MAX_KIN
   )) {
     return err(ErrorCode.PLACEMENT_EXCEEDS_KINGDOM_SIZE);
   }
-  const adjacentTiles = isAdjacent(
-    kingdom,
-    firstTile.position,
-    secondTile.position
-  );
-  if (adjacentTiles.length === 0) {
+  const adjacentPairs = isAdjacent(kingdom, firstTile, secondTile);
+  if (adjacentPairs.length === 0) {
     return err(ErrorCode.PLACEMENT_NOT_ADJACENT);
   }
-  const hasValidAdjacentTiles = hasValidAdjacent(adjacentTiles, [
-    firstTile.tile,
-    secondTile.tile
-  ]);
-  if (!hasValidAdjacentTiles) {
+  if (!hasValidAdjacent(adjacentPairs)) {
     return err(ErrorCode.PLACEMENT_INVALID_TERRAIN);
   }
   return ok(placeTiles(kingdom, [firstTile, secondTile]));
@@ -5485,34 +5477,32 @@ var isFreePlace = (kingdom, firstPosition, secondPosition) => {
   }
   return ok(true);
 };
-var isAdjacent = (kingdom, firstPosition, secondPosition) => {
+var isAdjacent = (kingdom, firstTile, secondTile) => {
   const offsets = [
     { x: -1, y: 0 },
     { x: 1, y: 0 },
     { x: 0, y: -1 },
     { x: 0, y: 1 }
   ];
-  const isOwnPosition = (x, y) => x === firstPosition.x && y === firstPosition.y || x === secondPosition.x && y === secondPosition.y;
-  const adjacentTiles = [];
-  for (const pos of [firstPosition, secondPosition]) {
+  const isOwnPosition = (x, y) => x === firstTile.position.x && y === firstTile.position.y || x === secondTile.position.x && y === secondTile.position.y;
+  const pairs = [];
+  for (const own of [firstTile, secondTile]) {
     for (const offset of offsets) {
-      const nx = pos.x + offset.x;
-      const ny = pos.y + offset.y;
+      const nx = own.position.x + offset.x;
+      const ny = own.position.y + offset.y;
       if (isOwnPosition(nx, ny)) continue;
       const tile = getTile(kingdom, { x: nx, y: ny });
       if (isOk(tile) && tile.value.type !== "empty") {
-        adjacentTiles.push(tile.value);
+        pairs.push({ neighbor: tile.value, own: own.tile });
       }
     }
   }
-  return adjacentTiles;
+  return pairs;
 };
-var hasValidAdjacent = (adjacentTiles, tiles) => {
-  return adjacentTiles.some((adjacentTile) => {
-    return tiles.some((tile) => {
-      return tile.type === adjacentTile.type || adjacentTile.type === "castle";
-    });
-  });
+var hasValidAdjacent = (pairs) => {
+  return pairs.some(
+    ({ neighbor, own }) => neighbor.type === "castle" || neighbor.type === own.type
+  );
 };
 var checkCastleIsInMiddle = (kingdom) => {
   let castleX;

package/dist/wasm-bridge.js

@@ -5362,19 +5362,11 @@ var placeDomino = (kingdom, position, rotation, domino, maxKingdomSize = MAX_KIN
   )) {
     return err(ErrorCode.PLACEMENT_EXCEEDS_KINGDOM_SIZE);
   }
-  const adjacentTiles = isAdjacent(
-    kingdom,
-    firstTile.position,
-    secondTile.position
-  );
-  if (adjacentTiles.length === 0) {
+  const adjacentPairs = isAdjacent(kingdom, firstTile, secondTile);
+  if (adjacentPairs.length === 0) {
     return err(ErrorCode.PLACEMENT_NOT_ADJACENT);
   }
-  const hasValidAdjacentTiles = hasValidAdjacent(adjacentTiles, [
-    firstTile.tile,
-    secondTile.tile
-  ]);
-  if (!hasValidAdjacentTiles) {
+  if (!hasValidAdjacent(adjacentPairs)) {
     return err(ErrorCode.PLACEMENT_INVALID_TERRAIN);
   }
   return ok(placeTiles(kingdom, [firstTile, secondTile]));
@@ -5400,34 +5392,32 @@ var isFreePlace = (kingdom, firstPosition, secondPosition) => {
   }
   return ok(true);
 };
-var isAdjacent = (kingdom, firstPosition, secondPosition) => {
+var isAdjacent = (kingdom, firstTile, secondTile) => {
   const offsets = [
     { x: -1, y: 0 },
     { x: 1, y: 0 },
     { x: 0, y: -1 },
     { x: 0, y: 1 }
   ];
-  const isOwnPosition = (x, y) => x === firstPosition.x && y === firstPosition.y || x === secondPosition.x && y === secondPosition.y;
-  const adjacentTiles = [];
-  for (const pos of [firstPosition, secondPosition]) {
+  const isOwnPosition = (x, y) => x === firstTile.position.x && y === firstTile.position.y || x === secondTile.position.x && y === secondTile.position.y;
+  const pairs = [];
+  for (const own of [firstTile, secondTile]) {
     for (const offset of offsets) {
-      const nx = pos.x + offset.x;
-      const ny = pos.y + offset.y;
+      const nx = own.position.x + offset.x;
+      const ny = own.position.y + offset.y;
       if (isOwnPosition(nx, ny)) continue;
       const tile = getTile(kingdom, { x: nx, y: ny });
       if (isOk(tile) && tile.value.type !== "empty") {
-        adjacentTiles.push(tile.value);
+        pairs.push({ neighbor: tile.value, own: own.tile });
       }
     }
   }
-  return adjacentTiles;
+  return pairs;
 };
-var hasValidAdjacent = (adjacentTiles, tiles) => {
-  return adjacentTiles.some((adjacentTile) => {
-    return tiles.some((tile) => {
-      return tile.type === adjacentTile.type || adjacentTile.type === "castle";
-    });
-  });
+var hasValidAdjacent = (pairs) => {
+  return pairs.some(
+    ({ neighbor, own }) => neighbor.type === "castle" || neighbor.type === own.type
+  );
 };
 var checkCastleIsInMiddle = (kingdom) => {
   let castleX;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pompidup/kingdomino-engine",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "A simple engine for the game Kingdomino",
   "main": "./dist/index.js",
   "type": "module",