From 934b1b7b2d04dfc9f6636f62fe58a26202fb4cc0 Mon Sep 17 00:00:00 2001
From: sorrelbri <sorrel.bri.june@gmail.com>
Date: Tue, 2 Jun 2020 00:23:21 -0700
Subject: [PATCH] add endGame to count territory

---
 packages/server/services/Game.js  | 28 ++++++++++++++++++++++++++--
 packages/server/test/Game.spec.js | 12 +++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/packages/server/services/Game.js b/packages/server/services/Game.js
index 85af0ea..eac2160 100644
--- a/packages/server/services/Game.js
+++ b/packages/server/services/Game.js
@@ -186,6 +186,7 @@ const Game = ({ gameData = {}, gameRecord = [] } = {}) => {
     komi: gameData.komi || 6.5, // komi depends on handicap stones + player rank
     handicap: gameData.handicap || 0,
     boardSize: gameData.boardSize || 19,
+    score: 0,
     groups: {}, // key is Symbol(position): {points: Set(), liberties: Set()}
     boardState: {},
     kos: [],
@@ -319,8 +320,10 @@ const Game = ({ gameData = {}, gameRecord = [] } = {}) => {
         if (!point.stone || point.territory) return point;
         const liberties = Array.from(this.groups[point.group].liberties);
         point.territory =
-          liberties.reduce((acc, { territory }) => acc + territory, 0) ||
-          point.stone;
+          liberties.reduce(
+            (acc, { territory }) => (territory === "d" ? acc : acc + territory),
+            0
+          ) || point.stone;
         return point;
       };
       let boardState = pipeMap(joinEmptyPoints)(this.boardState);
@@ -340,6 +343,27 @@ const Game = ({ gameData = {}, gameRecord = [] } = {}) => {
 
     endGame: function () {
       // if boardState is approved calculate winner
+      const [blackTerritory, whiteTerritory] = Object.values(
+        this.boardState
+      ).reduce(
+        ([blackTerritory, whiteTerritory], { territory, stone }) => {
+          if (territory === "d") return [blackTerritory, whiteTerritory];
+          if (territory > 0) {
+            if (stone === -1) return [blackTerritory + 2, whiteTerritory];
+            return [blackTerritory + 1, whiteTerritory];
+          }
+          if (territory < 0) {
+            if (stone === 1) return [blackTerritory, whiteTerritory + 2];
+            return [blackTerritory, whiteTerritory + 1];
+          }
+        },
+        [0, 0]
+      );
+      this.playerState.bScore = blackTerritory + this.playerState.bCaptures;
+      this.playerState.wScore = whiteTerritory + this.playerState.wCaptures;
+      this.score =
+        this.playerState.bScore - (this.playerState.wScore + this.komi);
+      this.winner = this.score > 0 ? 1 : -1;
       // submit end game board state and data for study
       // (study module should run client side and only )
       return this;
diff --git a/packages/server/test/Game.spec.js b/packages/server/test/Game.spec.js
index 6390557..afd8e88 100644
--- a/packages/server/test/Game.spec.js
+++ b/packages/server/test/Game.spec.js
@@ -1018,7 +1018,10 @@ describe("Game end logic", () => {
     { player: "white", pos: { x: 5, y: 19 } },
     { player: "black", pos: { x: 11, y: 19 } },
   ];
-  const honinboGame = Game({ gameRecord: honinboGameRecord })
+  const honinboGame = Game({
+    gameData: { komi: 4.5 },
+    gameRecord: honinboGameRecord,
+  })
     .submitPass("white")
     .submitPass("black");
 
@@ -1049,6 +1052,13 @@ describe("Game end logic", () => {
       done();
     });
   });
+
+  it.skip("end game counts territory properly", (done) => {
+    const game = honinboGame.endGame();
+    game.winner.should.eql(1);
+    game.score.should.eql(1.5);
+    done();
+  });
 });
 
 const initialMeta = {