From 3db891a6419b02a4ba377e0a66817f1049885ba6 Mon Sep 17 00:00:00 2001
From: yamanq <ybq987@gmail.com>
Date: Wed, 8 Jul 2015 00:35:31 -0400
Subject: [PATCH] fixed color management

---
 clashingcomrades/static/main.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/clashingcomrades/static/main.js b/clashingcomrades/static/main.js
index 0345aaa..82d0cc5 100644
--- a/clashingcomrades/static/main.js
+++ b/clashingcomrades/static/main.js
@@ -17,11 +17,6 @@ var claimedColors = {
     "red": "#FF9999",
     "blue": "#9999FF"
 }
-var redPlayer = "#E62E2E";
-var redClaimed = "#FF9999";
-var bluePlayer = "#4343D8";
-var blueClaimed = "#9999FF";
-
 
 document.getElementsByClassName('play')[0].onclick = function startGame() {
 
@@ -39,9 +34,6 @@ document.getElementsByClassName('play')[0].onclick = function startGame() {
     coordinate = [0,0];
     team = "blue";
 
-    playerColor = playerColors[team];
-    claimColor = claimedColors[team];
-
     // TODO IP Handling, most likely not necessary
 
     var login = document.getElementById("login");
@@ -129,7 +121,7 @@ function tableUpdate (coordinate, team) {
  // Creation of Player 
 
 function createPlayer() {
-    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = playerColor;
+    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = playerColors[team];
     table.rows[coordinate[0]].cells[coordinate[1]].className = "player ";
 }
 
@@ -139,7 +131,7 @@ function movement(x,y) {
         setTimeout(function() {
             try {
                 if (table.rows[coordinate[0] + y].cells[coordinate[1] + x].className.includes(team)) {
-                    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = claimColor;
+                    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = claimedColors[team];
                     document.getElementsByClassName('player')[0].className = "";
                     spectatorMode();
                 }
@@ -147,8 +139,8 @@ function movement(x,y) {
                     table.rows[coordinate[0]].cells[coordinate[1]].className = table.rows[coordinate[0]].cells[coordinate[1]].className.replace("player ", "");
                     table.rows[coordinate[0] + y].cells[coordinate[1] + x].className = "player ";
                     table.rows[coordinate[0] + y].cells[coordinate[1] + x].className += team;
-                    table.rows[coordinate[0] + y].cells[coordinate[1] + x].style.backgroundColor = playerColor;
-                    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = claimColor;
+                    table.rows[coordinate[0] + y].cells[coordinate[1] + x].style.backgroundColor = playerColors[team];
+                    table.rows[coordinate[0]].cells[coordinate[1]].style.backgroundColor = claimedColors[team];
                     coordinate = [coordinate[0] + y, coordinate[1] + x];
                     updateScore();
                     serverTransfer(coordinate,team,turn,username);