From 24053bb671327c231aba58b6268b69f82720f9ed Mon Sep 17 00:00:00 2001
From: niksteel <nikolassteel@gmail.com>
Date: Fri, 17 Jul 2015 23:20:16 -0500
Subject: [PATCH] fixed get_my_item_count and get_opponent_item_count bug and
 refactored myBotCollected and simpleBotCollected as myCollected and
 oppCollected respectively

---
 assets/js/board.js  | 26 ++++++++++++++------------
 assets/js/player.js |  6 +++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/assets/js/board.js b/assets/js/board.js
index 314f51b..916bc9f 100644
--- a/assets/js/board.js
+++ b/assets/js/board.js
@@ -108,13 +108,13 @@ var Board = {
             Board.numberOfItemTypes = HackF.getNumberOfItemTypes();
         } while(Board.numberOfItemTypes * Board.numberOfItemTypes >= HEIGHT * WIDTH);
         Board.totalItems = new Array();
-        Board.simpleBotCollected = new Array(Board.numberOfItemTypes);
-        Board.myBotCollected = new Array(Board.numberOfItemTypes);
+        Board.oppCollected = new Array(Board.numberOfItemTypes);
+        Board.myCollected = new Array(Board.numberOfItemTypes);
         var x;
         var y;
         for (var i=0; i<Board.numberOfItemTypes; i++) {
-            Board.myBotCollected[i] = 0;
-            Board.simpleBotCollected[i] = 0;
+            Board.myCollected[i] = 0;
+            Board.oppCollected[i] = 0;
             Board.totalItems[i] = i * 2 + 1;
             for (var j=0; j<Board.totalItems[i]; j++) {
                 do {
@@ -175,16 +175,16 @@ var Board = {
         console.log("["+Board.move_num+"] elapsed time: "+elapsed+"s");
         savePlayerScope(Player2);
         if ((Board.myX == Board.oppX) && (Board.myY == Board.oppY) && (myMove == TAKE) && (simpleBotMove == TAKE) && Board.board[Board.myX][Board.myY] > 0) {
-            Board.myBotCollected[Board.board[Board.myX][Board.myY]-1] = Board.myBotCollected[Board.board[Board.myX][Board.myY]-1] + 0.5;
-            Board.simpleBotCollected[Board.board[Board.oppX][Board.oppY]-1] = Board.simpleBotCollected[Board.board[Board.oppX][Board.oppY]-1] + 0.5;
+            Board.myCollected[Board.board[Board.myX][Board.myY]-1] = Board.myCollected[Board.board[Board.myX][Board.myY]-1] + 0.5;
+            Board.oppCollected[Board.board[Board.oppX][Board.oppY]-1] = Board.oppCollected[Board.board[Board.oppX][Board.oppY]-1] + 0.5;
             Board.board[Board.myX][Board.myY] = 0;
         } else {
             if (myMove == TAKE && Board.board[Board.myX][Board.myY] > 0) {
-                Board.myBotCollected[Board.board[Board.myX][Board.myY]-1]++;
+                Board.myCollected[Board.board[Board.myX][Board.myY]-1]++;
                 Board.board[Board.myX][Board.myY] = 0;
             }
             if (simpleBotMove == TAKE && Board.board[Board.oppX][Board.oppY] > 0) {
-                Board.simpleBotCollected[Board.board[Board.oppX][Board.oppY]-1]++;
+                Board.oppCollected[Board.board[Board.oppX][Board.oppY]-1]++;
                 Board.board[Board.oppX][Board.oppY] = 0;
             }
         }
@@ -238,8 +238,8 @@ var Board = {
             item_type_score_min = 0;
         var item_types_left = Board.numberOfItemTypes;
         for (var i=0; i < Board.numberOfItemTypes; i++) {
-            var diff = Board.myBotCollected[i] - Board.simpleBotCollected[i];
-            var numleft = Board.totalItems[i] - Board.myBotCollected[i] - Board.simpleBotCollected[i];
+            var diff = Board.myCollected[i] - Board.oppCollected[i];
+            var numleft = Board.totalItems[i] - Board.myCollected[i] - Board.oppCollected[i];
             var item_score_max = diff + numleft;
             var item_score_min = diff - numleft;
             if (item_score_min == 0 && item_score_max == 0) { // tie
@@ -344,11 +344,13 @@ function get_opponent_y() {
 }
 
 function get_my_item_count(type) {
-    return Board.myBotCollected[type-1];
+    if (window.currentPlayer == 2) { return Board.oppCollected[type-1]; }
+    return Board.myCollected[type-1];
 }
 
 function get_opponent_item_count(type) {
-    return Board.simpleBotCollected[type-1];
+    if (window.currentPlayer == 2) { return Board.myCollected[type-1]; }
+    return Board.oppCollected[type-1];
 }
 
 function get_total_item_count(type) {
diff --git a/assets/js/player.js b/assets/js/player.js
index 02976af..e8ee760 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -119,7 +119,7 @@ var GamePlay = {
         ctx.font = "15px Arial";
         ctx.fillStyle = "#000";
         for (var i=0; i<GamePlay.itemTypeCount; i++) {
-            ctx.fillText(Board.myBotCollected[i].toFixed(1), 50*i, 75);
+            ctx.fillText(Board.myCollected[i].toFixed(1), 50*i, 75);
             ctx.drawImage(GamePlay.itemImages[i], 52*i+15, 55, 25, 25);
         }
         ctx.font = "30px Arial";
@@ -128,7 +128,7 @@ var GamePlay = {
         ctx.font = "15px Arial";
         ctx.fillStyle = "#000";
         for (var i=0; i<GamePlay.itemTypeCount; i++) {
-            ctx.fillText(Board.simpleBotCollected[i].toFixed(1), 50*i, 150);
+            ctx.fillText(Board.oppCollected[i].toFixed(1), 50*i, 150);
             ctx.drawImage(GamePlay.itemImages[i], 52*i+15, 130, 25, 25);
         }
         ctx.font = "30px Arial";
@@ -137,7 +137,7 @@ var GamePlay = {
         ctx.font = "15px Arial";
         ctx.fillStyle = "#000";
         for (var i=0; i<GamePlay.itemTypeCount; i++) {
-            ctx.fillText((Board.totalItems[i]-Board.myBotCollected[i]-Board.simpleBotCollected[i]).toFixed(1), 50*i, 225);
+            ctx.fillText((Board.totalItems[i]-Board.myCollected[i]-Board.oppCollected[i]).toFixed(1), 50*i, 225);
             ctx.drawImage(GamePlay.itemImages[i], 52*i+15, 205, 25, 25);
         }
     },