restored got a pistol aimed at your heart sign

tbranyen · Feb 15, 2011 · b1396d8 · b1396d8
1 parent 1a0d9ee
commit b1396d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/game/ai.js b/game/ai.js
@@ -25,8 +25,8 @@ Engine.initObject("AIComponent", "LogicComponent", function() {
 
 		notifyIncoming: function(ordinance) {
 			if(ordinance.shooter != this.host)
-				if(!this.field.collider.objectAtLeastDistanceAway(this.host, ordinance, ordinance.safeDistance))
-					this.reactToBeingUnderFire();
+			    if(!this.field.collider.objectAtLeastDistanceAway(this.host, ordinance, ordinance.safeDistance))
+				    this.reactToBeingUnderFire();
 		},
 
         notifySound: function(soundMaker) {

diff --git a/game/collider.js b/game/collider.js
@@ -87,7 +87,7 @@ Engine.initObject("Collider", "Base", function() {
 		},
 
 		objectAtLeastDistanceAway: function(obj1, obj2, distance) {
-			if(obj1.getPosition().dist(obj2.getPosition()) >= distance)
+			if(obj1.getPosition().dist(obj2.getPosition()) > distance)
 				return true;
 			else
 				return false;

diff --git a/resources/level1.js b/resources/level1.js
@@ -145,7 +145,7 @@
 				sprite: { bitmapImage: "closestlight.png", sprites: { "main": { "f" : [0, 0, 227, 304] } } }
 			},
 			{
-				name: "signpistol", x: 7500, y: 95, scrollAttenuation: -1.6, zIndex: 2001,
+				name: "signpistol", x: 3400, y: 95, scrollAttenuation: -1.6, zIndex: 2001,
 				sprite: { bitmapImage: "signpistol.png", sprites: { "main": { "f" : [0, 0, 380, 394] } } }
 			},
 			{