Merge branch 'develop'

Author: Perlkonig

locales/en/apgames.json

@@ -5975,7 +5975,8 @@
             "NOPLACEMENTS": "You cannot move the workers such that you have no valid placements available.",
             "PARTIAL_MOVE": "Provide the destination.",
             "PARTIAL_PLACE": "Choose a cell to place a piece in.",
-            "PARTIAL_PLACE_SIZE": "Select the size of a piece to place."
+            "PARTIAL_PLACE_SIZE": "Select the size of a piece to place.",
+            "VALID_MOVE": "Looks like a valid move. You can also click the cell again to select the next available piece size."
         },
         "valley": {
             "BAD_VARIANT": "You can only move towers in the Moon Labyrinth variant.",

src/games/minefield.ts

@@ -40,7 +40,7 @@ export class MinefieldGame extends GameBase {
         urls: [
             "https://www.marksteeregames.com/Minefield_rules.pdf",
             "https://boardgamegeek.com/thread/3295906/new-mark-steere-game-minefield",
-            "https://boardgamegeek.com/thread/3299199/cartwheel-possibly-free-of-mutual-zugzwang",
+            "https://boardgamegeek.com/thread/3296675/pinwheel-minimal-restrictions",
         ],
         people: [
             {
@@ -494,25 +494,36 @@ export class MinefieldGame extends GameBase {
     protected checkEOG(): MinefieldGame {
         const prevPlayer = this.currplayer === 1 ? 2 : 1;
 
-        const graph = this.buildGraph(prevPlayer);
-        const [sources, targets] = this.lines[prevPlayer - 1];
-        for (const source of sources) {
-            for (const target of targets) {
-                if ( (graph.hasNode(source)) && (graph.hasNode(target)) ) {
-                    const path = bidirectional(graph, source, target);
-                    if (path !== null) {
-                        this.gameover = true;
-                        this.winner = [prevPlayer];
-                        this.connPath = [...path];
-                        break;
+        let passedOut = false;
+        if ( (this.lastmove === "pass") && (this.stack[this.stack.length - 1].lastmove === "pass") ) {
+            passedOut = true;
+        }
+
+        if (passedOut) {
+            this.gameover = true;
+            this.winner = [1,2];
+        } else {
+            const graph = this.buildGraph(prevPlayer);
+            const [sources, targets] = this.lines[prevPlayer - 1];
+            for (const source of sources) {
+                for (const target of targets) {
+                    if ( (graph.hasNode(source)) && (graph.hasNode(target)) ) {
+                        const path = bidirectional(graph, source, target);
+                        if (path !== null) {
+                            this.gameover = true;
+                            this.winner = [prevPlayer];
+                            this.connPath = [...path];
+                            break;
+                        }
                     }
                 }
-            }
-            if (this.gameover) {
-                break;
+                if (this.gameover) {
+                    break;
+                }
             }
         }
 
+
         if (this.gameover) {
             this.results.push(
                 {type: "eog"},

src/games/urbino.ts

@@ -720,9 +720,11 @@ export class UrbinoGame extends GameBase {
             }
 
             // we're good
+            // always return complete = 0 to allow continued clicking to rotate through pieces sizes
             result.valid = true;
-            result.complete = 1;
-            result.message = i18next.t("apgames:validation._general.VALID_MOVE");
+            result.canrender = true;
+            result.complete = 0;
+            result.message = i18next.t("apgames:validation.urbino.VALID_MOVE");
             return result;
         }