testing stuff

will fix pathnum later today
SubSage · Apr 11, 2013 · b2ecb07 · b2ecb07
1 parent 4f90095
commit b2ecb07
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/GDCalaga/data/paths.json b/GDCalaga/data/paths.json
@@ -1,13 +1,23 @@
 [
 	//Path 0
 	[
-	{goalX : 200,
-	goalY : 0,
+	{goalX : 1300,
+	goalY : 800,
 	speed : 1,
-	relative : true},
+	relative : false},
 
 	{goalX : 700,
-	goalY : 300,
+	goalY : 200,
+	speed : 1,
+	relative : false},
+
+	{goalX : 475,
+	goalY : 100,
+	speed : 1,
+	relative : false},
+
+	{goalX : 450,
+	goalY : 650,
 	speed : 1,
 	relative : false},
 
@@ -19,14 +29,14 @@
 
 	//Path 1
 	[
-	{goalX : 1400,
-	goalY : 360,
+	{goalX : 1300,
+	goalY : 300,
 	speed : 1,
 	relative : false},
 
 	{goalX : 700,
 	goalY : 360,
-	speed : 2,
+	speed : 1,
 	relative : false},
 
 	{goalX : 0,

diff --git a/GDCalaga/src/org/gdc/gdcalaga/Enemy.java b/GDCalaga/src/org/gdc/gdcalaga/Enemy.java
@@ -123,7 +123,7 @@ public void update(float delta)
         RectShape rect = (RectShape)shape;
         rect.pos.set(this.pos);
 
-        if(pos.x < -800 || pos.x > 3000 || pos.y < -800 || pos.y >3000){
+        if(pos.x < -500 || pos.x > 5000 || pos.y < -5000 || pos.y >5000){
         	Destroy();
         }
     }

diff --git a/GDCalaga/src/org/gdc/gdcalaga/Spawn.java b/GDCalaga/src/org/gdc/gdcalaga/Spawn.java
@@ -32,7 +32,7 @@ public static void spawnWave(PathRegistry paths, EntityManager mng) {
         	EnemyGroup group = new EnemyGroup(mng, 100, 800, 0);
 
             int pathNum = (int)Math.floor(Math.random() * paths.getNumOfPaths());
-
+            pathNum=0;
 
         	float x, y;
         	x = (float)(Math.random()*400);