M Attack.js → Attack.js

@@ -5,9 +5,9 @@ attack.rotation = 0;
 attack.src = {};
 
 attack.gfx = {};
-attack.gfx.overlay = new Image()
+attack.gfx.overlay = new Image();
 attack.gfx.overlay.src = "assets/ui/attackOverlay.png";
-attack.gfx.explosion = new Image()
+attack.gfx.explosion = new Image();
 attack.gfx.explosion.src = "assets/fx/explosion.png";
 
 attack.animCounter = 0;
@@ -18,6 +18,15 @@ {
   gameState.flow = "attackSelect";
   attack.src = map.data[mapCursor.x][mapCursor.y].unit;
   attack.pattern = attack.src.equipment.pattern;
+}
+
+attack.cpuInit = function()
+{
+	gameState.flow = "cpuAttackReady";
+	attack.src = teams.cpu.units[AI.focus];
+	attack.pattern = attack.src.equipment.pattern;
+	mapCursor.x = attack.src.target.x;
+	mapCursor.y = attack.src.target.y;
 }
 
 attack.cancel = function()
@@ -66,6 +75,8 @@ this.animCounter = 0;
     this.src.hasAttacked = true;
     if (gameState.flow != "youLose" && gameState.flow != "youWin")
     {
+    	if (gameState.phase == "cpu")
+      	AI.focus++;
       gameState.flow = "attackEnd";
     }
   }

M Engine.js → Engine.js

@@ -229,13 +229,32 @@ if (AI.focus >= teams.cpu.units.length)
   {
     AI.focus = 0;
     AI.manageEquipment();
-    gameState.flow = "cpuAttack";
+    gameState.flow = "cpuAttackInit";
   }
   else gameState.flow = "cpuGenTargets";
 }
 
-function cpuAttack()
+function cpuAttackInit()
+{
+  attack.cpuInit();
+}
+
+function cpuAttackReady()
+{
+  if (AI.focus >= teams.cpu.units.length)
+  {
+    AI.focus = 0;
+    endPhase();
+  }
+  else
+  {
+    gameState.flow = "cpuAttackGo";
+  }
+}
+
+function cpuAttackGo()
 {
+  attackAnim();
 }
 
 function loseScreen()
@@ -318,9 +337,15 @@ break;
       case "cpuMoveDone":
         cpuMoveDone();
         break;
-      case "cpuAttack":
-      	cpuAttack();
+      case "cpuAttackInit":
+      	cpuAttackInit();
       	break;
+      case "cpuAttackReady":
+      	cpuAttackReady();
+      	break;
+      case "cpuAttackGo":
+        cpuAttackGo();
+        break;
       case "youWin":
         winScreen();
         break;