rename movesPerTurn to moveLimit

boardgameio · Sep 10, 2019 · 61eb8d8 · 61eb8d8
1 parent 6dc3856
commit 61eb8d8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/examples/react-native/game.js b/examples/react-native/game.js
@@ -52,7 +52,7 @@ const TicTacToe = {
     },
   },
 
-  turn: { movesPerTurn: 1 },
+  turn: { moveLimit: 1 },
 
   endIf: (G, ctx) => {
     if (IsVictory(G.cells)) {

diff --git a/examples/react-web/src/chess/game.js b/examples/react-web/src/chess/game.js
@@ -40,7 +40,7 @@ const ChessGame = {
     },
   },
 
-  turn: { movesPerTurn: 1 },
+  turn: { moveLimit: 1 },
 
   endIf: G => {
     const chess = Load(G.pgn);

diff --git a/examples/react-web/src/tic-tac-toe/game.js b/examples/react-web/src/tic-tac-toe/game.js
@@ -52,7 +52,7 @@ const TicTacToe = {
   },
 
   turn: {
-    movesPerTurn: 1,
+    moveLimit: 1,
   },
 
   endIf: (G, ctx) => {

diff --git a/examples/react-web/src/ui/chess3d/game.js b/examples/react-web/src/ui/chess3d/game.js
@@ -40,7 +40,7 @@ const ChessGame = {
     },
   },
 
-  turn: { movesPerTurn: 1 },
+  turn: { moveLimit: 1 },
 
   endIf: G => {
     const chess = Load(G.pgn);

diff --git a/integration/src/game.js b/integration/src/game.js
@@ -54,7 +54,7 @@ const TicTacToe = Game({
   },
 
   flow: {
-    movesPerTurn: 1,
+    moveLimit: 1,
 
     endGameIf: (G, ctx) => {
       if (IsVictory(G.cells)) {

diff --git a/src/ai/bot.test.js b/src/ai/bot.test.js
@@ -54,7 +54,7 @@ const TicTacToe = Game({
     },
   },
 
-  turn: { movesPerTurn: 1 },
+  turn: { moveLimit: 1 },
 
   endIf: (G, ctx) => {
     if (IsVictory(G.cells)) {

diff --git a/src/core/flow.js b/src/core/flow.js
@@ -136,7 +136,7 @@ export function Flow({
  *
  *     // End the turn automatically after a certain number
  *     // of moves.
- *     movesPerTurn: 1,
+ *     moveLimit: 1,
  *
  *     // Code to run at the end of a move.
  *     onMove: (G, ctx, { type: 'moveName', args: [] }) => G
@@ -262,10 +262,7 @@ export function FlowWithPhases({
     const conf = phaseMap[ctx.phase];
 
     const currentPlayerMoves = ctx.stats.turn.numMoves[ctx.currentPlayer] || 0;
-    if (
-      conf.turn.movesPerTurn &&
-      currentPlayerMoves >= conf.turn.movesPerTurn
-    ) {
+    if (conf.turn.moveLimit && currentPlayerMoves >= conf.turn.moveLimit) {
       return true;
     }
     return conf.turn.endIf(G, ctx);
@@ -424,9 +421,9 @@ export function FlowWithPhases({
 
     const conf = phaseMap[ctx.phase];
 
-    // Prevent ending the turn if movesPerTurn haven't been made.
+    // Prevent ending the turn if moveLimit haven't been made.
     const currentPlayerMoves = ctx.stats.turn.numMoves[ctx.currentPlayer] || 0;
-    if (conf.turn.movesPerTurn && currentPlayerMoves < conf.turn.movesPerTurn) {
+    if (conf.turn.moveLimit && currentPlayerMoves < conf.turn.moveLimit) {
       return state;
     }
 

diff --git a/src/core/flow.test.js b/src/core/flow.test.js
@@ -196,11 +196,11 @@ describe('phases', () => {
   });
 });
 
-test('movesPerTurn', () => {
+test('moveLimit', () => {
   {
     const flow = FlowWithPhases({
       turn: {
-        movesPerTurn: 2,
+        moveLimit: 2,
       },
     });
     let state = flow.init({ ctx: flow.ctx(2) });
@@ -215,11 +215,11 @@ test('movesPerTurn', () => {
 
   {
     const flow = FlowWithPhases({
-      turn: { movesPerTurn: 2 },
+      turn: { moveLimit: 2 },
       phases: {
         B: {
           turn: {
-            movesPerTurn: 1,
+            moveLimit: 1,
           },
         },
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ const TicTacToe = { @@
       },
       turn: {
-        movesPerTurn: 1,
+        moveLimit: 1,
       },
       endIf: (G, ctx) => {
@@ Expand Down @@