isFull関数の追加

takenaka · Oct 21, 2021 · 699e69c · 699e69c
1 parent e3eb71a
commit 699e69c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/model/board.ts b/src/model/board.ts
@@ -12,6 +12,7 @@ export interface IBoard {
   canPutStone: (coodinate: Coodinate) => boolean;
   getStone: (coodinate: Coodinate) => IStone | null;
   countStone: (state: StoneState) => number;
+  isFull: () => boolean;
   init: (number: number) => void;
 }
 
@@ -94,4 +95,12 @@ export class Board implements IBoard {
 
     return count;
   };
+
+  public isFull = () => {
+    if (this.countStone('white') + this.countStone('black') < this.size ** 2) {
+      return false
+    }
+
+    return true;
+  }
 }
diff --git a/src/model/othello.ts b/src/model/othello.ts
@@ -29,7 +29,6 @@ export class Othello {
   private readonly io: IIO;
   private turnPlayer: IPlayer;
   private pass = 0;
-  private countStone = 0;
 
   constructor(board: IBoard, stoneCreator: IStoneCreator, playerCreator: IPlayerCreator, io: IIO) {
     this.board = board;
@@ -61,7 +60,7 @@ export class Othello {
       this.io.message(`先行は${this.turnPlayer.name}です`);
 
       // 2連続パスか盤面が一杯になるまで
-      while (this.pass < 2 && this.countStone < this.board.size ** 2) {
+      while (this.pass < 2 && !this.board.isFull) {
         await this.turn();
       }
 
@@ -84,10 +83,6 @@ export class Othello {
       const stone = this.board.getStone(flipableStone);
       stone?.flip();
     });
-
-    const countWhiteStone = this.board.countStone('white');
-    const countBlackStone = this.board.countStone('black');
-    this.countStone = countWhiteStone + countBlackStone;
   };
 
   private changeTurn = () => {