From 7bf5927d99b9d11e073b23b20d1eec3c5e599f5a Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_eikona@ketrenos.com>
Date: Sun, 5 Jun 2022 10:05:33 -0700
Subject: [PATCH] Track player vs robber steals and display in Winner

Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
---
 client/src/Winner.js   | 26 +++++++++++++++-----------
 server/routes/games.js |  9 ++++++++-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/client/src/Winner.js b/client/src/Winner.js
index 107bea4..c8ca94e 100644
--- a/client/src/Winner.js
+++ b/client/src/Winner.js
@@ -91,10 +91,10 @@ const Winner = ({ winnerDismissed, setWinnerDismissed }) => {
   let robber;
   let max = 0;
 
-  let playerStolen = [];
+  let playerStolen = {};
   const stats = winner.stolen;
   for (let player in stats) {
-    if (player === 'total') {
+    if (player === 'total' || player === 'player') {
       continue;
     }
     if (player === 'robber') {
@@ -109,7 +109,7 @@ const Winner = ({ winnerDismissed, setWinnerDismissed }) => {
         </>;
       }
       robber = <div>
-        Throughout the game, the robber stole <b>{stats.robber.stole.total}
+        Throughout the game, the robber blocked <b>{stats.robber.stole.total}
         </b> resources:
         <div className="ThiefStole">{robber}</div></div>;
       continue;
@@ -120,12 +120,16 @@ const Winner = ({ winnerDismissed, setWinnerDismissed }) => {
     }
     if (stats[player].stolen.total > max) {
       max = stats[player].stolen.total;
-      playerStolen = [];
+      playerStolen = {
+        robber: stats[player].stolen.robber,
+        player: stats[player].stolen.player,
+        element: <></>
+      };
     }
 
     let stolen;
     for (let type in stats[player].stolen) {
-      if (type === 'total') {
+      if ([ 'total', 'robber', 'player' ].indexOf(type) !== -1) {
         continue;
       }
       if (!stolen) {
@@ -137,15 +141,15 @@ const Winner = ({ winnerDismissed, setWinnerDismissed }) => {
       </>;
     }
     if (stolen) {
-      playerStolen.push(<div key={player}>
+      playerStolen.element = <div key={player}>
         <PlayerColor color={player}/> {winner.players[player].name} 
         <div className="PlayerStolen">{stolen}</div>
-      </div>);
+      </div>;
     }
   }
   
   if (!robber) {
-    robber = <div>The robber never stole any resources from anyone!</div>;
+    robber = <div>The robber never blocked any resources from anyone!</div>;
   }
 
   const averageSeconds = Math.floor(winner.totalTime / turnCount / 1000),
@@ -178,10 +182,10 @@ const Winner = ({ winnerDismissed, setWinnerDismissed }) => {
           <div>The game took {totalTime}.</div>
           { robber }
           { max !== 0 && <>
-            <div>The thief (and other players) stole the most resources 
-              from:</div>
+            <div>The robber stole {playerStolen.robber} and other players
+            stole {playerStolen.player} resources from:</div> 
             <div className="PlayerStolenList">
-              { playerStolen }
+              { playerStolen.element }
             </div>
           </> }
           </div>
diff --git a/server/routes/games.js b/server/routes/games.js
index c20d4ae..9ee4482 100755
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -4396,7 +4396,9 @@ const trackTheft = (game, from, to, type, count) => {
           total: 0
         },
         stolen: { /* the resources stolen from this player */
-          total: 0
+          total: 0, 
+          player: 0, /* by players */ 
+          robber: 0 /* by robber */
         }
       };
     }
@@ -4412,6 +4414,11 @@ const trackTheft = (game, from, to, type, count) => {
 
   /* Update counts */
   stats[from].stolen.total += count;
+  if (to === 'robber') {
+    stats[from].stolen.robber += count;
+  } else {
+    stats[from].stolen.player += count;
+  }
   stats[from].stolen[type] += count;
   stats[to].stole.total += count;
   stats[to].stole[type] += count;