retire flow section

boardgameio · Sep 10, 2019 · 33ac684 · 33ac684
1 parent d75fe44
commit 33ac684
Show file tree

Hide file tree

Showing 26 changed files with 241 additions and 322 deletions.
diff --git a/examples/react-native/game.js b/examples/react-native/game.js
@@ -54,14 +54,12 @@ const TicTacToe = Game({
     },
   },
 
-  flow: {
-    turn: { movesPerTurn: 1 },
+  turn: { movesPerTurn: 1 },
 
-    endGameIf: (G, ctx) => {
-      if (IsVictory(G.cells)) {
-        return ctx.currentPlayer;
-      }
-    },
+  endGameIf: (G, ctx) => {
+    if (IsVictory(G.cells)) {
+      return ctx.currentPlayer;
+    }
   },
 });
 

diff --git a/examples/react-web/src/chess/game.js b/examples/react-web/src/chess/game.js
@@ -41,29 +41,27 @@ const ChessGame = Game({
     },
   },
 
-  flow: {
-    turn: { movesPerTurn: 1 },
+  turn: { movesPerTurn: 1 },
 
-    endGameIf: G => {
-      const chess = Load(G.pgn);
-      if (chess.game_over()) {
-        if (
-          chess.in_draw() ||
-          chess.in_threefold_repetition() ||
-          chess.insufficient_material() ||
-          chess.in_stalemate()
-        ) {
-          return 'd';
-        }
-        if (chess.in_checkmate()) {
-          if (chess.turn() == 'w') {
-            return 'b';
-          } else {
-            return 'w';
-          }
+  endGameIf: G => {
+    const chess = Load(G.pgn);
+    if (chess.game_over()) {
+      if (
+        chess.in_draw() ||
+        chess.in_threefold_repetition() ||
+        chess.insufficient_material() ||
+        chess.in_stalemate()
+      ) {
+        return 'd';
+      }
+      if (chess.in_checkmate()) {
+        if (chess.turn() == 'w') {
+          return 'b';
+        } else {
+          return 'w';
         }
       }
-    },
+    }
   },
 });
 

diff --git a/examples/react-web/src/phases/diagram.js b/examples/react-web/src/phases/diagram.js
@@ -14,14 +14,11 @@ import './diagram.css';
 
 const game = Game({
   moves: {},
-
-  flow: {
-    startingPhase: 'A',
-    phases: {
-      A: { next: 'B' },
-      B: { next: 'C' },
-      C: { next: 'A' },
-    },
+  startingPhase: 'A',
+  phases: {
+    A: { next: 'B' },
+    B: { next: 'C' },
+    C: { next: 'A' },
   },
 });
 

diff --git a/examples/react-web/src/phases/phases.js b/examples/react-web/src/phases/phases.js
@@ -32,9 +32,7 @@ const game = Game({
     },
   },
 
-  flow: {
-    startingPhase: 'take',
-  },
+  startingPhase: 'take',
 });
 
 class Board extends React.Component {

diff --git a/examples/react-web/src/redacted-move/game.js b/examples/react-web/src/redacted-move/game.js
@@ -20,17 +20,17 @@ const RedactedMoves = Game({
   }),
 
   moves: {
-    /* eslint-disable no-unused-vars */
-    clickCell(G, ctx, secretstuff) {
-      return { ...G };
+    clickCell: {
+      /* eslint-disable no-unused-vars */
+      impl: (G, ctx, secretstuff) => {
+        return { ...G };
+      },
+      /* eslint-enable no-unused-vars */
+      redact: true,
     },
-    /* eslint-enable no-unused-vars */
   },
 
-  flow: {
-    redactedMoves: ['clickCell'],
-    turnOrder: TurnOrder.ANY,
-  },
+  turn: { order: TurnOrder.ANY },
 
   playerView: PlayerView.STRIP_SECRETS,
 });

diff --git a/examples/react-web/src/tic-tac-toe/game.js b/examples/react-web/src/tic-tac-toe/game.js
@@ -53,17 +53,15 @@ const TicTacToe = Game({
     },
   },
 
-  flow: {
-    movesPerTurn: 1,
+  movesPerTurn: 1,
 
-    endGameIf: (G, ctx) => {
-      if (IsVictory(G.cells)) {
-        return { winner: ctx.currentPlayer };
-      }
-      if (G.cells.filter(c => c === null).length == 0) {
-        return { draw: true };
-      }
-    },
+  endGameIf: (G, ctx) => {
+    if (IsVictory(G.cells)) {
+      return { winner: ctx.currentPlayer };
+    }
+    if (G.cells.filter(c => c === null).length == 0) {
+      return { draw: true };
+    }
   },
 });
 

diff --git a/examples/react-web/src/turnorder/example-any-once.js b/examples/react-web/src/turnorder/example-any-once.js
@@ -10,13 +10,11 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    startingPhase: 'A',
-    phases: {
-      A: { turnOrder: TurnOrder.ANY_ONCE, next: 'B' },
-      B: {},
-    }
-  },
+  startingPhase: 'A',
+  phases: {
+    A: { turn: { order: TurnOrder.ANY_ONCE }, next: 'B' },
+    B: {},
+  }
 }
 `;
 
@@ -33,15 +31,13 @@ export default {
       move: G => G,
     },
 
-    flow: {
-      endTurn: false,
-      endPhase: false,
-      startingPhase: 'A',
+    endTurn: false,
+    endPhase: false,
+    startingPhase: 'A',
 
-      phases: {
-        A: { turnOrder: TurnOrder.ANY_ONCE, next: 'B' },
-        B: {},
-      },
+    phases: {
+      A: { turn: { order: TurnOrder.ANY_ONCE }, next: 'B' },
+      B: {},
     },
   }),
 };
diff --git a/examples/react-web/src/turnorder/example-any.js b/examples/react-web/src/turnorder/example-any.js
@@ -10,9 +10,7 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    turnOrder: TurnOrder.ANY,
-  },
+  turn: { order: TurnOrder.ANY },
 }
 `;
 
@@ -29,10 +27,8 @@ export default {
       move: G => G,
     },
 
-    flow: {
-      endTurn: false,
-      endPhase: false,
-      turnOrder: TurnOrder.ANY,
-    },
+    endTurn: false,
+    endPhase: false,
+    turn: { order: TurnOrder.ANY },
   }),
 };
diff --git a/examples/react-web/src/turnorder/example-custom-from.js b/examples/react-web/src/turnorder/example-custom-from.js
@@ -14,9 +14,7 @@ const code = `{
     order: ['1', '0', '2', '3', '5', '4'],
   }),
 
-  flow: {
-    turnOrder: TurnOrder.CUSTOM_FROM('order'),
-  },
+  turn: { order: TurnOrder.CUSTOM_FROM('order') },
 }
 `;
 
@@ -33,9 +31,7 @@ export default {
       order: ['1', '0', '2', '3', '5', '4'],
     }),
 
-    flow: {
-      endPhase: false,
-      turnOrder: TurnOrder.CUSTOM_FROM('order'),
-    },
+    endPhase: false,
+    turn: { order: TurnOrder.CUSTOM_FROM('order') },
   }),
 };
diff --git a/examples/react-web/src/turnorder/example-custom.js b/examples/react-web/src/turnorder/example-custom.js
@@ -10,9 +10,7 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    turnOrder: TurnOrder.CUSTOM(['1', '0', '2', '3', '5', '4']),
-  },
+  turn: { order: TurnOrder.CUSTOM(['1', '0', '2', '3', '5', '4']) },
 }
 `;
 
@@ -25,9 +23,7 @@ const Description = () => (
 export default {
   description: Description,
   game: Game({
-    flow: {
-      endPhase: false,
-      turnOrder: TurnOrder.CUSTOM(['1', '0', '2', '3', '5', '4']),
-    },
+    endPhase: false,
+    turn: { order: TurnOrder.CUSTOM(['1', '0', '2', '3', '5', '4']) },
   }),
 };
diff --git a/examples/react-web/src/turnorder/example-once.js b/examples/react-web/src/turnorder/example-once.js
@@ -10,11 +10,9 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    phases: {
-      A: { turnOrder: TurnOrder.ONCE },
-      B: {},
-    },
+  phases: {
+    A: { turn: { order: TurnOrder.ONCE }, next: 'B' },
+    B: {},
   },
 }
 `;
@@ -28,13 +26,11 @@ const Description = () => (
 export default {
   description: Description,
   game: Game({
-    flow: {
-      endPhase: false,
-      startingPhase: 'A',
-      phases: {
-        A: { turnOrder: TurnOrder.ONCE, next: 'B' },
-        B: {},
-      },
+    endPhase: false,
+    startingPhase: 'A',
+    phases: {
+      A: { turn: { order: TurnOrder.ONCE }, next: 'B' },
+      B: {},
     },
   }),
 };
diff --git a/examples/react-web/src/turnorder/example-others-once.js b/examples/react-web/src/turnorder/example-others-once.js
@@ -10,15 +10,13 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    startingPhase: 'play',
+  startingPhase: 'play',
 
-    phases: {
-      play: {},
+  phases: {
+    play: {},
 
-      discard: {
-        turnOrder: TurnOrder.OTHERS_ONCE,
-      },
+    discard: {
+      turn: { order: TurnOrder.OTHERS_ONCE },
     },
   },
 
@@ -45,16 +43,14 @@ export default {
   description: Description,
 
   game: Game({
-    flow: {
-      endPhase: false,
-      startingPhase: 'play',
+    endPhase: false,
+    startingPhase: 'play',
 
-      phases: {
-        play: {},
+    phases: {
+      play: {},
 
-        discard: {
-          turnOrder: TurnOrder.OTHERS_ONCE,
-        },
+      discard: {
+        turn: { order: TurnOrder.OTHERS_ONCE },
       },
     },
 

diff --git a/examples/react-web/src/turnorder/example-others.js b/examples/react-web/src/turnorder/example-others.js
@@ -10,9 +10,7 @@ import React from 'react';
 import { Game, TurnOrder } from 'boardgame.io/core';
 
 const code = `{
-  flow: {
-    turnOrder: TurnOrder.OTHERS,
-  },
+  turn: { order: TurnOrder.OTHERS },
 }
 `;
 
@@ -29,9 +27,7 @@ export default {
       move: G => G,
     },
 
-    flow: {
-      endPhase: false,
-      turnOrder: TurnOrder.OTHERS,
-    },
+    endPhase: false,
+    turn: { order: TurnOrder.OTHERS },
   }),
 };