stub makeMove in Game v2 API
This commit is contained in:
Sorrel Bri
parent
37db281d08
commit
a54d4bf7e4
2 changed files with 51 additions and 30 deletions
|
|
@ -106,7 +106,7 @@ const initBoard = ({ boardSize, handicap }) => {
|
|||
// returns Game object
|
||||
const Game = ({gameData = {}, gameRecord = []} = {}) => ({
|
||||
winner: gameData.winner ||null,
|
||||
turn: gameData.turn || 1, // turn logic depends on handicap stones
|
||||
turn: gameData.turn || 0, // turn logic depends on handicap stones
|
||||
pass: gameData.pass || 0, // -1 represents state in which resignation has been submitted, not confirmed
|
||||
komi: gameData.komi || 6.5, // komi depends on handicap stones + player rank
|
||||
handicap: gameData.handicap || 0,
|
||||
|
|
@ -127,18 +127,33 @@ const Game = ({gameData = {}, gameRecord = []} = {}) => ({
|
|||
this.turn = this.handicap ? -1 : 1;
|
||||
this.boardState = initBoard({ boardSize: this.boardSize, handicap: this.handicap})
|
||||
// return this.boardState
|
||||
return { ...this, boardState: getBoardState(this)};
|
||||
return { ...this, legalMoves: getBoardState(this)};
|
||||
},
|
||||
|
||||
getMeta: function() {
|
||||
return { winner: this.winner, turn: this.turn, pass: this.pass, playerState: this.playerState, gameRecord: this.gameRecord }
|
||||
},
|
||||
|
||||
makeMove: function({ player, pos: {x, y}}) {
|
||||
let success = false;
|
||||
const point = this.boardState[`${x}-${y}`];
|
||||
const isTurn = ( this.turn === 1 && player === 'black' )
|
||||
|| ( this.turn === -1 && player === 'white' );
|
||||
if (isTurn) {
|
||||
if (point.legal) {
|
||||
point.makeMove(this.turn);
|
||||
this.turn *= -1;
|
||||
success = true;
|
||||
}
|
||||
}
|
||||
return {...this, legalMoves: getBoardState(this), success };
|
||||
}
|
||||
});
|
||||
|
||||
const Point = ({x, y, boardSize = 19}) => ({
|
||||
pos: {x, y},
|
||||
stone: 0, // can be 1, -1, 0, or 'k' for ko
|
||||
legal: 0,
|
||||
legal: true,
|
||||
territory: 0,
|
||||
capturing: [],
|
||||
groupMembers: [ this ],
|
||||
|
|
@ -147,6 +162,11 @@ const Point = ({x, y, boardSize = 19}) => ({
|
|||
btm: x < boardSize ? `${ x + 1 }-${ y }` : null,
|
||||
rgt: y < boardSize ? `${ x }-${ y + 1 }` : null,
|
||||
lft: y > 1 ? `${ x }-${ y - 1 }` : null
|
||||
},
|
||||
|
||||
makeMove: function(turn) {
|
||||
this.stone = turn;
|
||||
this.legal = false;
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -25,82 +25,82 @@ describe('Game', () => {
|
|||
Game().getMeta()
|
||||
.should.eql(initialMeta);
|
||||
Game().initGame().getMeta()
|
||||
.should.eql(initialMeta);
|
||||
.should.eql({ ...initialMeta, turn: 1 });
|
||||
done();
|
||||
})
|
||||
});
|
||||
|
||||
describe('Game.initGame() returns boardState', () => {
|
||||
it('init Game returns default 19x19', done => {
|
||||
Game().initGame().boardState
|
||||
Game().initGame().legalMoves
|
||||
.should.eql(emptyBoard);
|
||||
done();
|
||||
});
|
||||
|
||||
it('init Game with 2 handicap returns boardState with stones', done => {
|
||||
Game({gameData: { handicap: 2 }}).initGame().boardState
|
||||
Game({gameData: { handicap: 2 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '4-16': 1, '16-4': 1});
|
||||
done();
|
||||
});
|
||||
|
||||
it('init 19x19 Game with all levels of handicap returns boardState with stones', done => {
|
||||
Game({gameData: { boardSize: 19, handicap: 2 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 2 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 3 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 3 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 4 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 4 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 5 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 5 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '10-10': 1, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 6 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 6 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '10-4': 1, '4-10': 1, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 7 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 7 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '10-10': 1, '10-4': 1, '4-10': 1, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 8 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 8 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '16-10': 1, '10-4': 1, '10-16': 1, '4-10': 1, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
Game({gameData: { boardSize: 19, handicap: 9 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 19, handicap: 9 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard, '10-10': 1, '16-10': 1, '10-4': 1, '10-16': 1, '4-10': 1, '4-4': 1, '16-16': 1, '4-16': 1, '16-4': 1 });
|
||||
done();
|
||||
})
|
||||
|
||||
it('init 13x13 Game returns boardState', done => {
|
||||
Game({gameData: { boardSize: 13 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13 }}).initGame().legalMoves
|
||||
.should.eql(emptyBoard13);
|
||||
done();
|
||||
});
|
||||
|
||||
it('init 13x13 Game with all levels of handicap returns boardState with stones', done => {
|
||||
Game({gameData: { boardSize: 13, handicap: 2 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 2 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 3 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 3 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 4 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 4 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 5 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 5 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '7-7': 1, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 6 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 6 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '7-4': 1, '4-7': 1, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 7 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 7 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '7-7': 1, '7-4': 1, '4-7': 1, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 8 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 8 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '10-7': 1, '7-4': 1, '7-10': 1, '4-7': 1, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
Game({gameData: { boardSize: 13, handicap: 9 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 13, handicap: 9 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard13, '7-7': 1, '10-7': 1, '7-4': 1, '7-10': 1, '4-7': 1, '4-4': 1, '10-10': 1, '4-10': 1, '10-4': 1 });
|
||||
done();
|
||||
});
|
||||
|
||||
it('init 9x9 Game returns boardState', done => {
|
||||
Game({gameData: { boardSize: 9 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 9 }}).initGame().legalMoves
|
||||
.should.eql(emptyBoard9);
|
||||
done();
|
||||
});
|
||||
|
||||
it('init 9x9 Game with all levels of handicap returns boardState with stones', done => {
|
||||
Game({gameData: { boardSize: 9, handicap: 2 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 9, handicap: 2 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard9, '3-7': 1, '7-3': 1 });
|
||||
Game({gameData: { boardSize: 9, handicap: 3 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 9, handicap: 3 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard9, '7-7': 1, '3-7': 1, '7-3': 1 });
|
||||
Game({gameData: { boardSize: 9, handicap: 4 }}).initGame().boardState
|
||||
Game({gameData: { boardSize: 9, handicap: 4 }}).initGame().legalMoves
|
||||
.should.eql({...emptyBoard9, '3-3': 1, '7-7': 1, '3-7': 1, '7-3': 1 });
|
||||
done();
|
||||
});
|
||||
|
|
@ -108,15 +108,16 @@ describe('Game.initGame() returns boardState', () => {
|
|||
|
||||
describe('Game.makeMove({ player: str, pos: { x: int, y: int } })', () => {
|
||||
it('place move returns game object with proper board', done => {
|
||||
Game().initGame().makeMove({ player: 'black', pos: { x: 4, y: 4 } }).boardState
|
||||
.should.eql({ ...emptyBoard, '4-4': 1 });
|
||||
Game().initGame().makeMove({ player: 'black', pos: { x: 4, y: 4 } }).success
|
||||
.should.eql(true)
|
||||
// .should.eql({ ...emptyBoard, '4-4': 1 });
|
||||
done();
|
||||
})
|
||||
})
|
||||
|
||||
const initialMeta = {
|
||||
winner: null,
|
||||
turn: 1,
|
||||
turn: 0,
|
||||
pass: 0,
|
||||
playerState: {
|
||||
bCaptures: 0,
|
||||
|
|
|
|||
Loading…
Reference in a new issue