M Movement.js → Movement.js

@@ -5,7 +5,7 @@ // animation
 
 window.movement = {};
 movement.chain = new Array();
-movement.unit = {};
+movement.unit = null;
 movement.pool = 0;
 movement.animCounter = 0;
 movement.gfx = {};
@@ -23,47 +23,47 @@ }
 
 movement.init = function(u)
 {
-  this.unit = u;
-  this.pool = u.agi;
-  this.chain.push(new Coords(u.x, u.y));
+  movement.unit = u;
+  movement.pool = u.agi;
+  movement.chain.push(new Coords(u.x, u.y));
 }
 
 movement.cancel = function()
 {
-  this.unit = {};
-  this.pool = 0;
-  this.chain = new Array();
+  movement.unit = null;
+  movement.pool = 0;
+  movement.chain = new Array();
   gameState.flow = "freeLook";
 }
 
 movement.listen = function()
 {
   var z = null;
-  var chainEnd = this.chain[this.chain.length - 1];
-  this.ticker = new Date();
+  var chainEnd = this.chain[movement.chain.length - 1];
+  movement.ticker = new Date();
   if (controller.z)
   {
     while (this.chain.length > 1)
     {
-      this.chain.pop();
-      this.pool = this.unit.agi;
-      mapCursor.x = this.chain[0].x;
-      mapCursor.y = this.chain[0].y;
+      movement.chain.pop();
+      movement.pool = this.unit.agi;
+      mapCursor.x = movement.chain[0].x;
+      mapCursor.y = movement.chain[0].y;
     }
   }
 
   if (controller.x)
   {
-    this.cancel();
+    movement.cancel();
     return;
   }
 
   if (controller.y)
   {
-    this.confirm();
+    movement.confirm();
     return;
   }
-  if (this.ticker - this.lastMove >= 200)
+  if (movement.ticker - movement.lastMove >= 200)
   {
 
   if (controller.up)
@@ -85,18 +85,19 @@ if (controller.right)
   {
     z = new Coords(chainEnd.x + 1, chainEnd.y);
   }
-    this.lastMove = this.ticker;
+    movement.lastMove = movement.ticker;
   }
   if (z !== null)
   {
-    if (map.data[z.x][z.y].agiMod <= this.pool && z.x >= 0 && z.x < map.sz && z.y >= 0 && z.y < map.sz && map.data[z.x][z.y].unit === null)
+    if (map.data[z.x][z.y].agiMod <= movement.pool && z.x >= 0 && z.x < map.sz && z.y >= 0 && z.y < map.sz && map.data[z.x][z.y].unit === null)
     {
-      if (this.unit.name != "p1 Battle Angel")
+      if (movement.unit.name != "p1 Battle Angel")
       {
-        this.pool -= map.data[z.x][z.y].agiMod + 1;
+        movement.pool -= map.data[z.x][z.y].agiMod + 1;
       }
-      else { this.pool -= 1; }
-      this.chain.push(z);
+      else { movement.pool -= 1; }
+      movement.chain.push(z);
+      console.dir(movement.chain);
       mapCursor.x = z.x;
       mapCursor.y = z.y;
     }
@@ -111,7 +112,7 @@ screen.textBaseline = "top";
   screen.fillStyle = "white";
   for (c = 0; c < this.chain.length; c++)
   {
-    screen.drawImage(this.gfx.overlay, 16*(this.chain[c].x - camera.x), 16*(this.chain[c].y - camera.y));
+    screen.drawImage(movement.gfx.overlay, 16*(movement.chain[c].x - camera.x), 16*(movement.chain[c].y - camera.y));
   }
 }
 
@@ -145,9 +146,9 @@ AI.focus++;
         gameState.flow = "cpuMoveDone"; }
       return;
     }
-    if (movement.chain.length > 0 && movement.unit.target != undefined)
+    if (movement.chain.length > 0){
       moveToTile(movement.unit, movement.chain[0]);
-    else{
+    }else{
     	movement.unit.hasMoved = true;
       movement.unit = null;
       movement.chain = new Array();