Cifra: Fix race condition

Author: Perlkonig

src/games/cifra.ts

@@ -152,7 +152,7 @@ export class CifraGame extends GameBase {
         if (this.gameover) { return []; }
 
         // side choosing
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return ["light,top", "light,bottom", "dark,top", "dark,bottom","light,left", "light,right", "dark,left", "dark,right"];
         }
 
@@ -200,7 +200,7 @@ export class CifraGame extends GameBase {
     }
 
     public getButtons(): ICustomButton[] {
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return [
                 { label: "cifra.lt", move: "light,top" },
                 { label: "cifra.lb", move: "light,bottom" },
@@ -216,7 +216,7 @@ export class CifraGame extends GameBase {
     }
 
     public randomMove(): string {
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             const shuffled = shuffle(["light,top", "light,bottom", "dark,top", "dark,bottom","light,left", "light,right", "dark,left", "dark,right"]) as string[];
             return shuffled[0];
         } else if ( (this.variants.includes("sum") || this.variants.includes("king")) && this.stack.length <= 3) {
@@ -253,7 +253,7 @@ export class CifraGame extends GameBase {
     }
 
     public getHomeRowCol(p: playerid): {col?: number; row?: number}|undefined {
-        if (this.stack.length < 2 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return undefined;
         }
         const [, position] = this.firstChoice.split(",");
@@ -267,15 +267,15 @@ export class CifraGame extends GameBase {
     }
 
     public get firstPos(): string|undefined {
-        if (this.stack.length < 2 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return undefined;
         }
         const [, position] = this.firstChoice.split(",");
         return position;
     }
 
     public getPlayerColour(p: playerid): number|string {
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return "#808080";
         }
         const [shade,] = this.firstChoice.split(",");
@@ -285,7 +285,7 @@ export class CifraGame extends GameBase {
     }
 
     public getPlayerShade(p: playerid): Shade|undefined {
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             return undefined
         }
         const [shade,] = this.firstChoice.split(",");
@@ -381,7 +381,7 @@ export class CifraGame extends GameBase {
 
         if (m.length === 0) {
             let context = "play";
-            if (this.stack.length === 1 || this.firstChoice === undefined) {
+            if (this.firstChoice === undefined) {
                 context = "choose";
             } else if ((this.variants.includes("king") || this.variants.includes("sum")) && this.stack.length <= 2) {
                 context = "setup";
@@ -393,7 +393,7 @@ export class CifraGame extends GameBase {
         }
 
         // setup scenarios first
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             const [shade, pos] = m.split(",")
             if ( (shade === "light" || shade === "dark") && (pos === "top" || pos === "bottom" || pos === "left" || pos === "right") ) {
                 result.valid = true;
@@ -534,7 +534,7 @@ export class CifraGame extends GameBase {
         }
 
         // choosing sides
-        if (this.stack.length === 1 || this.firstChoice === undefined) {
+        if (this.firstChoice === undefined) {
             this.firstChoice = m;
             this.results.push({type: "affiliate", which: m});
             // if in default Dash mode, populate the board