Fixed AI spawn bugs, cleaned up the solution.

Mourtz · Mourtz · commit d8bdaf58e14e · 2015-05-23T09:32:22.000+03:00
diff --git a/gamescene.html b/gamescene.html
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
-
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta charset="UTF-8">
     <script src="lib/jquery.min.js"></script>
     <script src="lib/jquery.transit.min.js"></script>
@@ -18,10 +18,8 @@
     <link rel="stylesheet" type="text/css" href="css/ui.css">
     <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
 </head>
-
 <body>
     <div class="gamecont">
-
 </body>
 
 </html>
diff --git a/src/Enemy.js b/src/Enemy.js
@@ -15,7 +15,7 @@ function Enemy(_color1,blockID){
 
   this.isDead = false;
   this._c ;
-  grid.cell[grid.getCell(this.block)].setCellType('Enemy');
+  grid.cell[grid.getCell(this.block)].type='Enemy';
 }
 
 //$    INITIALIZATION    $
@@ -73,7 +73,7 @@ Enemy.prototype.move = function(SwipeType){
   switch(SwipeType){
     case 'top':
       if(grid.cell[this._c].checkCell(SwipeType,this._c)
-         ||grid.cell[this._c - cellsCntX].type === 'Enemy'){
+         &&grid.cell[this._c - cellsCntX].type !== 'Enemy'){
 
         //Handle Top Swap
         grid.cell[this._c].setCellType('Normal');
@@ -87,7 +87,7 @@ Enemy.prototype.move = function(SwipeType){
       break;
     case 'bottom':
       if(grid.cell[this._c].checkCell(SwipeType,this._c)
-         ||grid.cell[this._c + cellsCntX].type === 'Enemy'){
+         &&grid.cell[this._c + cellsCntX].type !== 'Enemy'){
 
         //Handle Bottom Swap
         grid.cell[this._c].setCellType('Normal');
@@ -101,7 +101,7 @@ Enemy.prototype.move = function(SwipeType){
       break;
     case 'left':
       if(grid.cell[this._c].checkCell(SwipeType,this._c)
-        ||grid.cell[this._c - 1].type === 'Enemy'){
+        &&grid.cell[this._c - 1].type !== 'Enemy'){
 
         //Handle Left Swap
         grid.cell[this._c].setCellType('Normal');
@@ -115,7 +115,7 @@ Enemy.prototype.move = function(SwipeType){
       break;
     case 'right':
       if(grid.cell[this._c].checkCell(SwipeType,this._c)
-        ||grid.cell[this._c + 1].type === 'Enemy'){
+        &&grid.cell[this._c + 1].type !== 'Enemy'){
 
         //Handle Right Swap
         grid.cell[this._c].setCellType('Normal');
diff --git a/src/index.js b/src/index.js
@@ -41,9 +41,9 @@ var gameStateRestarts = 0 ;
 //-----$*********$-----
 
 var color ;
-var grid ;
+var grid  ;
 var actor ;
-var enemy = [];
+var enemy ;
 
 /*~~~~~$*********$~~~~~*/
 /*~~~~~$ CLASSES $~~~~~*/
@@ -60,6 +60,7 @@ var game = new Phaser.Game(Editor_Width, Editor_Height, Phaser.AUTO, 'SkipStack'
 
 //$ preload function $
 function preload() {
+  enemy = new Array();
   cellWidth = (Editor_Width - (2*cellsCntX + 2)) / (cellsCntX);
   cellHeight = (Editor_Width - (2*cellsCntY + 2)) / (cellsCntY);
 }
@@ -90,29 +91,7 @@ function create() {
   actor.init();
 
   //enemies initialization ("geometry draw call")
-  for(var i=0;i<3;i++){
-    var x = '';
-    if(randomBoolean[0]()==true){
-      if(randomBoolean[0]()==true)
-        x = '0-'+getRandomInt(0,cellsCntY);
-      else
-        x = getRandomInt(0,cellsCntX)+'-0';
-    }
-    else{
-      if(randomBoolean[0]()==true)
-        x = (cellsCntX-1)+'-'+getRandomInt(0,cellsCntY);
-      else
-        x = getRandomInt(0,cellsCntX)+'-'+(cellsCntY-1);
-    }
-
-    if(grid.cell[grid.getCell(x)].type === 'Normal')
-      enemy.push(new Enemy(enemiesColor,x));
-    else
-      i--;
-  }
-
-  //Here's where we add additional enemies
-  for(var i=0;i<gameStateRestarts;i++){
+  for(var i=0;i<3+gameStateRestarts;i++){
     var x = '';
     if(randomBoolean[0]()==true){
       if(randomBoolean[0]()==true)
@@ -134,8 +113,8 @@ function create() {
   }
 
   //enemy initialization ("geometry draw call")
-  for(var i=0;i<enemy.length;i++)
-    enemy[i].init();
+  for(var x=0;x<enemy.length;x++)
+    enemy[x].init();
 
   EnemyMoveTimeout = game.time.time + beatRate
 }
@@ -145,7 +124,7 @@ function update() {
     for(var i=0;i<enemy.length;i++)
       enemy[i].update();
 
-    blips_sfx.play();
+    //blips_sfx.play();
     EnemyMoveTimeout = game.time.time + beatRate;
   }
 
@@ -162,7 +141,7 @@ function render() {
 
 function gameOver(){
   if(enemy.length>Math.ceil(cellsCntX/2))
-    cellsCntY = cellsCntX += 1;
+    cellsCntY = ++ cellsCntX;
 
   gameStateRestarts ++;
   game.state.start(game.state.current);
