Terrace: Validation fix

Author: Perlkonig

playground/index.html

@@ -27,7 +27,7 @@
                 var resultStr = '<p style="color: '+ colour +'">' + result.message + '</p>';
                 var statusbox = document.getElementById("clickstatus");
                 statusbox.innerHTML = resultStr;
-                if ( ( (result.hasOwnProperty("canrender")) && (result.canrender === true) ) || (result.complete < 1) ) {
+                if ( ( (result.hasOwnProperty("canrender")) && (result.canrender === true) ) || (result.complete >= 0) ) {
                     game.move(result.move, {partial: true});
                     var interim = JSON.stringify(game.render());
                     window.sessionStorage.setItem("interim", interim);
@@ -52,7 +52,7 @@
                 var resultStr = '<p style="color: '+ colour +'">' + result.message + '</p>';
                 var statusbox = document.getElementById("clickstatus");
                 statusbox.innerHTML = resultStr;
-                if ( ( (result.hasOwnProperty("canrender")) && (result.canrender === true) ) || (result.complete < 1) ) {
+                if ( ( (result.hasOwnProperty("canrender")) && (result.canrender === true) ) || (result.complete >= 0) ) {
                     game.move(result.move + ",", {partial: true});
                     var interim = JSON.stringify(game.render({perspective: 1}));
                     window.sessionStorage.setItem("interim", interim);

src/games/terrace.ts

@@ -482,15 +482,15 @@ export class TerraceGame extends GameBase {
             return result;
         }
 
-        // if no possible moves for that piece, then reject
-        if (allmoves.filter(mv => mv.startsWith(m)).length === 0) {
-            result.valid = false;
-            result.message = i18next.t("apgames:validation.terrace.NO_MOVES", {cell: fCell});
-            return result;
-        }
-
         // if to is empty, then possible partial
         if (to === undefined || to.length === 0) {
+            // if no possible moves for that piece, then reject
+            if (allmoves.filter(mv => mv.startsWith(m)).length === 0) {
+                result.valid = false;
+                result.message = i18next.t("apgames:validation.terrace.NO_MOVES", {cell: fCell});
+                return result;
+            }
+
             result.valid = true;
             result.complete = -1;
             result.canrender = true;