game-of-death

commit

b2ffceb75a7627629451bc41d2bdaa85e43d00f7

parent

019970b3cfaa4c3367cec745b6aa3d8b1eee1ed4

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2019-10-31 06:29

merge limitBuildSpace into single value

Diffstat

2 files changed, 4 insertions, 6 deletions

diff --git a/scenarios/01_03survive.js b/scenarios/01_03survive.js

@@ -7,8 +7,7 @@ export default {
    7     7     "description": "Try and survive for 100 turns. You only have 5 Tiles. You may only build in the top left corner.",
    8     8     "board": scenBoard,
    9     9     "tileLimit": 5,
   10    -1     "limitBuildSpaceA": {x: 0, y: 0},
   11    -1     "limitBuildSpaceB": {x: 10, y: 10},
   -1    10     "limitBuildSpace": {x1: 0, y1: 0, x2: 10, y2: 10},
   12    11     "winCondition": function(state) {
   13    12         if (logic.compareBoards(scenBoard, state.game.board)) {
   14    13             return false;

diff --git a/src/index.js b/src/index.js

@@ -62,8 +62,8 @@ on('mousedown', '.board-cell', function(state, event) {
   62    62     const y = Array.prototype.indexOf.call(board.children, row);
   63    63     const currentPlayer = state.game.currentPlayer === constants.EMPTY ? constants.GAIA : state.game.currentPlayer;
   64    64     if (
   65    -1         (state.game.limitBuildSpaceA && state.game.limitBuildSpaceB) &&
   66    -1         (x < state.game.limitBuildSpaceA.x || x > state.game.limitBuildSpaceB.x || y < state.game.limitBuildSpaceA.y || y > state.game.limitBuildSpaceB.y)
   -1    65         (state.game.limitBuildSpace) &&
   -1    66         (x < state.game.limitBuildSpace.x1 || x > state.game.limitBuildSpace.x2 || y < state.game.limitBuildSpace.y1 || y > state.game.limitBuildSpace.y2)
   67    67     ) return;
   68    68     if (state.game.board[y][x] === currentPlayer) {
   69    69         state.game.board[y][x] = constants.EMPTY;
@@ -142,8 +142,7 @@ on('click', '.js-menu-scenario', function(state) {
  142   142         description: scenarios[i].description,
  143   143         winCondition: scenarios[i].winCondition,
  144   144         tileLimit: scenarios[i].tileLimit || Infinity,
  145    -1         limitBuildSpaceA: scenarios[i].limitBuildSpaceA,
  146    -1         limitBuildSpaceB: scenarios[i].limitBuildSpaceB,
   -1   145         limitBuildSpace: scenarios[i].limitBuildSpace,
  147   146         currentPlayer: 1,
  148   147         playing: false,
  149   148         steps: 0,