diff --git a/src/game/Game.test.ts b/src/game/Game.test.ts index 8a0c7fb..058d835 100644 --- a/src/game/Game.test.ts +++ b/src/game/Game.test.ts @@ -1,5 +1,5 @@ import "jest" -import {EndState, Game, SelectionMode} from "./Game" +import { EndState, Game, SelectionMode } from "./Game" describe("GameState", () => { const threeByThreeMatrix = [ @@ -12,35 +12,67 @@ describe("GameState", () => { const unlimitedTime = 999 * 1000 test("getting size works", () => { - expect((new Game(["00"], [["AA"]], unrestrictedBuffer, unlimitedTime)).size).toEqual(1) - expect((new Game([ - "00", "01", - "10", "11", - ], [], unrestrictedBuffer, unlimitedTime)).size).toEqual(2) + expect((new Game({ matrix: ["00"], sequences: [["AA"]], maxBufferLength: unrestrictedBuffer, timeout: unlimitedTime })).size).toEqual(1) + expect((new Game({ + matrix: [ + "00", "01", + "10", "11", + ], + sequences: [], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + })).size).toEqual(2) }); test("getting cell works", () => { - const game = new Game(threeByThreeMatrix, [["AA"]], unrestrictedBuffer, unlimitedTime); - expect(game.getCell(0, 2)).toEqual("02") + const game = new Game({ + matrix: threeByThreeMatrix, + sequences: [["AA"]], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); + expect(game.getCell(0, 2)).toEqual({ value: "02", isUsed: false }) }); describe("picking", () => { test("starts with free pick", () => { - const game = new Game([], [["AA"]], 1, unlimitedTime); - expect(game.state).toEqual({selectionMode: SelectionMode.FreePick}) + const game = new Game({ matrix: [], sequences: [["AA"]], maxBufferLength: 1, timeout: unlimitedTime }); + expect(game.state).toEqual({ selectionMode: SelectionMode.FreePick }) }); test("picking cells works", () => { - const game = new Game(threeByThreeMatrix, [["AA"]], unrestrictedBuffer, unlimitedTime); + const game = new Game({ + matrix: threeByThreeMatrix, + sequences: [["AA"]], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); game.pick(0, 0); - expect(game.state).toEqual({selectionMode: SelectionMode.RowPick, column: 0}); + expect(game.state).toEqual({ selectionMode: SelectionMode.RowPick, column: 0 }); + expect(game.getCell(0, 0).isUsed).toEqual(true); expect(() => game.pick(0, 2)).toThrow(); game.pick(2, 0); - expect(game.state).toEqual({selectionMode: SelectionMode.ColumnPick, row: 2}); + expect(game.state).toEqual({ selectionMode: SelectionMode.ColumnPick, row: 2 }); + }); + + test("cannot pick cell twice", () => { + const game = new Game({ + matrix: threeByThreeMatrix, + sequences: [["AA"]], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); + game.pick(0, 0); + expect(() => game.pick(0, 0)).toThrow(); }); test("picking outside of range fails", () => { - const game = new Game(threeByThreeMatrix, [], unrestrictedBuffer, unlimitedTime); + const game = new Game({ + matrix: threeByThreeMatrix, + sequences: [], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); expect(() => game.pick(-1, 0)).toThrow(); expect(() => game.pick(0, -1)).toThrow(); expect(() => game.pick(3, 0)).toThrow(); @@ -49,41 +81,60 @@ describe("GameState", () => { test("picking fills buffer, fulfills sequence", () => { const simpleSequence = ["00", "10", "20"] - const game = new Game(threeByThreeMatrix, [simpleSequence], unrestrictedBuffer, unlimitedTime); - expect(game.getSequences()).toEqual([{sequence: simpleSequence, numberOfFulfilled: 0}]) + const game = new Game({ + matrix: threeByThreeMatrix, + sequences: [simpleSequence], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); + expect(game.getSequences()).toEqual([{ sequence: simpleSequence, numberOfFulfilled: 0 }]) game.pick(0, 0); - expect(game.buffer).toEqual(["00"]); - expect(game.getSequences()).toEqual([{sequence: simpleSequence, numberOfFulfilled: 1}]) + expect(game.buffer).toEqual([{ + positionInMatrixRow: 0, + positionInMatrixColumn: 0, + value: "00" + }]); + expect(game.getSequences()).toEqual([{ sequence: simpleSequence, numberOfFulfilled: 1 }]) }); test("picking fulfills second sequence occurence", () => { const sequence = ["AA", "BB", "CC"] - const game = new Game([ + const game = new Game({ + matrix: [ "AA", "AA", "BB", "BB", "CC", "AA", "CC", "CC", "CC", - ], [sequence], unrestrictedBuffer, unlimitedTime); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 0}]) + ], + sequences: [sequence], + maxBufferLength: unrestrictedBuffer, + timeout: unlimitedTime, + }); + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 0 }]) game.pick(0, 0); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 1}]) + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 1 }]) game.pick(2, 0); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 2}]) + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 2 }]) game.pick(2, 1); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 1}]) + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 1 }]) game.pick(0, 1); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 2}]) + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 2 }]) game.pick(0, 2); - expect(game.getSequences()).toEqual([{sequence: sequence, numberOfFulfilled: 3}]) + expect(game.getSequences()).toEqual([{ sequence: sequence, numberOfFulfilled: 3 }]) }); }); describe("game end conditions", () => { test("game won", () => { - const game = new Game([ + const game = new Game({ + matrix: [ "AA", "AA", "BB", "BB", "CC", "AA", "CC", "CC", "CC", - ], [["AA", "BB", "CC"]], 3, unlimitedTime) + ], + sequences: [["AA", "BB", "CC"]], + maxBufferLength: 3, + timeout: unlimitedTime, + }) game.pick(0, 0) game.pick(2, 0) game.pick(2, 2) @@ -92,11 +143,16 @@ describe("GameState", () => { }) test("game loose", () => { - const game = new Game([ + const game = new Game({ + matrix: [ "AA", "AA", "BB", "BB", "CC", "AA", "CC", "CC", "CC", - ], [["AA", "BB", "CC"]], 3, unlimitedTime) + ], + sequences: [["AA", "BB", "CC"]], + maxBufferLength: 3, + timeout: unlimitedTime, + }) game.pick(0, 0) game.pick(1, 0) game.pick(1, 2) @@ -122,11 +178,16 @@ describe("GameState", () => { } test("loosing through timeout works", () => { - const game = new Game([ - "AA", "AA", "BB", - "BB", "CC", "AA", - "CC", "CC", "CC", - ], [["AA"]], 3, 10_000) + const game = new Game({ + matrix: [ + "AA", "AA", "BB", + "BB", "CC", "AA", + "CC", "CC", "CC", + ], + sequences: [["AA"]], + maxBufferLength: 3, + timeout: 10_000, + }) fakeTimeProgress(1_000) expect(game.remainingMilliseconds).toEqual(9_000) fakeTimeProgress(1_000) @@ -139,11 +200,17 @@ describe("GameState", () => { }) test("clock stops when game is won", () => { - const game = new Game([ - "AA", "AA", "BB", - "BB", "CC", "AA", - "CC", "CC", "CC", - ], [["AA"]], 3, 10_000) + const game = new Game({ + matrix: [ + "AA", "AA", "BB", + "BB", "CC", "AA", + "CC", "CC", "CC", + ], + sequences: [["AA"]], + maxBufferLength: unrestrictedBuffer, + timeout: 10_000, + } + ) fakeTimeProgress(1_000) game.pick(0, 0) expect(game.remainingMilliseconds).toEqual(9_000) diff --git a/src/game/Game.ts b/src/game/Game.ts index f6fda32..ccd3de2 100644 --- a/src/game/Game.ts +++ b/src/game/Game.ts @@ -1,3 +1,5 @@ +import GameConfiguration from "./GameConfiguration"; + export enum EndState { Won, Lost, @@ -76,47 +78,59 @@ interface Sequence { numberOfFulfilled: number } +interface Buffer { + value: string + positionInMatrixRow: number + positionInMatrixColumn: number +} + +interface Cell { + value: string + isUsed: boolean +} + export class Game { state: State = {selectionMode: SelectionMode.FreePick} public readonly size: number - public readonly buffer: string[] = [] + public readonly buffer: Buffer[] = [] private readonly timeoutInterval: ReturnType private readonly startTimeTimeStamp: number private endTimestamp: number | null = null - constructor( - public readonly matrix: string[], - private readonly sequences: string[][], - public readonly maxBufferLength: number, - public readonly timeout: number, - ) { - this.size = Math.sqrt(matrix.length) + constructor(private readonly config: GameConfiguration) { + this.size = Math.sqrt(config.matrix.length) this.timeoutInterval = setTimeout(() => { this.state = EndState.Lost this.stopClock() }, - this.timeout) + this.config.timeout) this.startTimeTimeStamp = Date.now() } get remainingMilliseconds(): number { if (this.endTimestamp) { - return this.timeout - (this.endTimestamp - this.startTimeTimeStamp) + return this.config.timeout - (this.endTimestamp - this.startTimeTimeStamp) } - return this.timeout - (Date.now() - this.startTimeTimeStamp) + return this.config.timeout - (Date.now() - this.startTimeTimeStamp) } - getCell(row: number, column: number): string { - return this.matrix[row + column * this.size] + getCell(row: number, column: number): Cell { + return { + value: this.config.matrix[row + column * this.size], + isUsed: this.buffer.some(x => + x.positionInMatrixRow == row && + x.positionInMatrixColumn == column + ), + } } getSequences(): Sequence[] { - return this.sequences.map(sequence => { + return this.config.sequences.map(sequence => { let longestPrefixLength = 0 for (let i = 0; i < this.buffer.length; ++i) { let prefixLength = 0; for (let j = 0; j < Math.min(sequence.length, this.buffer.length - i); ++j) { - if (this.buffer[i + j] != sequence[j]) { + if (this.buffer[i + j].value != sequence[j]) { // abort sequence prefixLength = 0 break; @@ -145,7 +159,7 @@ export class Game { this.state = EndState.Won } else { this.stopClock() - if (this.buffer.length >= this.maxBufferLength) { + if (this.buffer.length >= this.config.maxBufferLength) { this.state = EndState.Lost } } @@ -160,7 +174,16 @@ export class Game { Won: () => {throw new IllegalMoveError()}, Lost: () => {throw new IllegalMoveError()}, InProgress: (selectionMode) => { - this.buffer.push(this.getCell(row, column)) + const cell = this.getCell(row, column) + if (cell.isUsed) { + throw new IllegalMoveError() + } + + this.buffer.push({ + value: cell.value, + positionInMatrixRow: row, + positionInMatrixColumn: column, + }) matchSelectionState({ Free: () => { diff --git a/src/game/GameConfiguration.ts b/src/game/GameConfiguration.ts new file mode 100644 index 0000000..fed361d --- /dev/null +++ b/src/game/GameConfiguration.ts @@ -0,0 +1,6 @@ +export default interface GameConfiguration { + matrix: string[] + sequences: string[][] + maxBufferLength: number + timeout: number +} \ No newline at end of file