Merge branch 'master' of github.com:louisremi/Slasher

louisremi · Nov 25, 2012 · 0bb01fd · 0bb01fd
2 parents 7280b0b + af9526d
commit 0bb01fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/components/teenagers.js b/components/teenagers.js
@@ -21,7 +21,7 @@ Crafty.c("Teenagers", {
 					z: 20,
 					name: key,
 					offsetY: data.offsetY
-				})
+				}).tilePos();
 		});
 
 		// Don't forget the corroded sprite
@@ -36,23 +36,23 @@ Crafty.c("Teenagers", {
 
 Crafty.Teenagers = {
 	Quarterback: {
-		initialPosition: [5,2],
+		initialPosition: [12,6],
 		offsetY: 0
 	},
 	Cheerleader: {
-		initialPosition: [5,3],
+		initialPosition: [10,8],
 		offsetY: 1
 	},
 	Geek: {
-		initialPosition: [5,4],
+		initialPosition: [11,8],
 		offsetY: 2
 	},
 	Emo: {
-		initialPosition: [5,5],
+		initialPosition: [11,7],
 		offsetY: 3
 	},
 	Gangsta: {
-		initialPosition: [5,6],
+		initialPosition: [12,7],
 		offsetY: 4
 	}
 };

diff --git a/panic.js b/panic.js
@@ -25,7 +25,7 @@
 
         Crafty.PathFinder.enterPanicMode();
 
-        var position = {x:0,y:0,z:40};
+        var position = {x:9*Crafty.tileSize,y:9*Crafty.tileSize,z:40};
         Crafty('Door').each(function(door) {
         	position.x = door._x;
         	position.y = door._y;