The bot is mush more clever now

Author: lgkorange

debug.log

@@ -0,0 +1,2 @@
+[0118/144727:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004
+[0118/144727:ERROR:node_debugger.cc(86)] Cannot start debugger server

index.html

@@ -15,8 +15,11 @@
             <div id="field-outer">
                 <div id="field">
                     <div v-for="(r, rIndex) in rows" class="row">
-                        <div v-for="(c, cIndex) in cols" class="col" v-bind:class="{'selectable': selectedFigure && isColSelectable(rIndex, cIndex) && !selectedFigure.moveDirection}" v-on:click="selectCol(rIndex, cIndex)">
-                            <span style="color:white;background:black">r{{rIndex}} c{{cIndex}}</span>
+                        <div v-for="(c, cIndex) in cols" class="col" 
+                            v-bind:class="{'selectable': selectedFigure && isColSelectable(rIndex, cIndex) && !selectedFigure.moveDirection}" 
+                            v-bind:id="'col-r' + rIndex + '-c' + cIndex"
+                            v-on:click="selectCol(rIndex, cIndex)">
+                            <!--<span style="color:white;background:black">r{{rIndex}} c{{cIndex}}</span>-->
                             <template v-for="(f, fIndex) in figures">
                                 <div v-if="f.coordination.r == rIndex && f.coordination.c == cIndex"
                                     v-bind:class="[{'active': currentFigure && currentFigure.id == f.id, 'focus': focusedFigure && focusedFigure.id == f.id }, 'team-' + f.team, 'orientation-' + f.orientation, 'move-' + f.moveDirection]"
@@ -64,10 +67,6 @@
                         v-on:click="doAction(a)">
                         {{a.id}}
                     </button>
-
-                    <button type="button" v-on:click="getClosestRivalFigure()">
-                        Choose closest rival figure
-                    </button>
                 </div>
 
                 <template v-if="currentFigure && selectedAction && !showOrientationControls && !isMoving">

script/main.js

@@ -137,7 +137,7 @@ var bot = {
 		}
 
 		setTimeout(function() {
-			app.chooseOrientation("top");
+			app.chooseOrientation(app.currentFigure.orientation);
 		}, 1000);
 	}
 };
@@ -259,6 +259,12 @@ var app = new Vue({
 			var diffC = Math.abs(sC - cIndex);
 
 			var retVal = (diffR + diffC) <= app.selectedAction.range;
+			if (retVal && app.selectedAction.id == "move") {
+				retVal = !document.querySelector("#col-r" + rIndex + "-c" + cIndex + " .figure");
+			}
+			else if (retVal) {
+				retVal = document.querySelector("#col-r" + rIndex + "-c" + cIndex + " .figure");
+			}
 			if (retVal) {
 				data.selectedCols.push({r: rIndex, c: cIndex});
 			}
@@ -518,6 +524,7 @@ var app = new Vue({
 					document.removeEventListener("selectedOrientation", callback.orientationChange, false);
 					if (isSubTurn || app.selectedAction.id == "wait") {
 						// End turn and change figure
+						app.focusFigure(app.focusedFigure);
 						app.turn(figureIndex+1);
 					}
 					else {

script/teams.js

@@ -1,7 +1,7 @@
 var teams = {
     teams: [
         {
-            id: "GoodBot",
+            id: "Good",
             color: "#52A7C6"
         },
         {