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

louisremi · Nov 25, 2012 · 3ae4166 · 3ae4166
2 parents afc0f59 + 126a0aa
commit 3ae4166
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/components/raytracing.js b/components/raytracing.js
@@ -13,10 +13,10 @@
 			var norm = Math.sqrt(Math.pow(normal.x,2) + Math.pow(normal.y,2));
 			normal = {x:normal.x*(Crafty.tileSize/2)/norm,y:normal.y*(Crafty.tileSize/2)/norm};
 
-			var ray = new Crafty.polygon([origin._x + (Crafty.tileSize/2) + (normal.x/2),origin.y+(Crafty.tileSize/2)-(normal.y/2)],
-				[origin._x + (Crafty.tileSize/2) - (normal.x/2),origin.y+(Crafty.tileSize/2)+(normal.y/2)],
-				[dest._x + (Crafty.tileSize/2) - (normal.x/2),dest.y+(Crafty.tileSize/2)+(normal.y/2)],
-				[dest._x + (Crafty.tileSize/2) + (normal.x/2),dest.y+(Crafty.tileSize/2)-(normal.y/2)]);
+			var ray = new Crafty.polygon([origin._x+16 + (Crafty.tileSize/2) + (normal.x/2),origin._y+32+(Crafty.tileSize/2)-(normal.y/2)],
+				[origin._x+16 + (Crafty.tileSize/2) - (normal.x/2),origin._y+32+(Crafty.tileSize/2)+(normal.y/2)],
+				[dest._x+16 + (Crafty.tileSize/2) - (normal.x/2),dest._y+32+(Crafty.tileSize/2)+(normal.y/2)],
+				[dest._x+16 + (Crafty.tileSize/2) + (normal.x/2),dest._y+32+(Crafty.tileSize/2)-(normal.y/2)]);
 
 			return ray;
 		},

diff --git a/components/teenager.js b/components/teenager.js
@@ -48,8 +48,9 @@
 					}
 				})
 				.onHit("Slasher",function() {
-					this.dieAHorribleDeath();
-					Crafty.trigger('NpcDead');
+					if (!this.dead) {
+						this.dieAHorribleDeath();
+					}
 				});
 		},
 
@@ -71,13 +72,15 @@
 				});
 			}
 
+			Crafty.trigger('NpcDead');
+
 			return this;
 		},
 
 		dieAHorribleDeath: function() {
 			this.animate('deathBySlasher', 3, this.offsetY, 6).animate('deathBySlasher',300,0);
 			this.removeComponent(this.name+'Sprite');
-			this.dead = true;
+			this.die();
 			this.stop().addComponent(this.name+'DeadSprite');
 
 			return this;
@@ -174,6 +177,11 @@
 			} else {
 				this.tilePos();
 				this.isMoving = false;
+
+				if(Crafty.panic) {
+					this.destroy();
+					Crafty.trigger('NpcEscape');
+				}
 			}
 
 			return this;

diff --git a/game.js b/game.js
@@ -136,6 +136,21 @@ window.onload = function () {
 
         //create our player entity with some premade components
     });
+    var deaths = 0;
+    var escaped = 0;
+    Crafty.bind('NpcDead', function() {
+        deaths++;
+        if(deaths+escaped >=5) {
+            Crafty.pause();
+        }
+    });
+
+    Crafty.bind('NpcEscape', function() {
+        escaped++;
+        if(deaths+escaped >=5) {
+            Crafty.pause();
+        }
+    })
 
     Crafty.bind('PANIC',enterPanicMode);
 

diff --git a/panic.js b/panic.js
@@ -12,6 +12,8 @@
 
         Jeu.musique.panic();
 
+        Crafty.panic = true;
+
         Crafty.sprite(104, "assets/sprites/teenagers.png", {
         	SlasherSprite:[1,5],
         });