Skip to content
Browse files

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

  • Loading branch information...
2 parents 7280b0b + af9526d commit 0bb01fda6c40df54aa902695c969f359baf6e004 @louisremi committed Nov 25, 2012
Showing with 7 additions and 7 deletions.
  1. +6 −6 components/teenagers.js
  2. +1 −1 panic.js
View
12 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
}
};
View
2 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;

0 comments on commit 0bb01fd

Please sign in to comment.
Something went wrong with that request. Please try again.