Found bug where there are no more normal pills left, now pacman heads…

… for power pills in normal mode
tylorr · Feb 2, 2012 · f762d0d · f762d0d
1 parent 161beeb
commit f762d0d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 25 deletions.
diff --git a/game/Exec.java b/game/Exec.java
@@ -44,7 +44,8 @@ public static void main(String[] args)
 		//exec.runMyExperiment(new Legacy2TheReckoning(), 100, 80, 95, 1);
 
 		//this can be used for numerical testing (non-visual, no delays)
-		exec.runExperiment(new MyPacMan(),new MyGhosts(),100);
+		//exec.runExperiment(new MyPacMan(),new RandomGhosts(),100);
+		exec.runGameTimed(new MyPacMan(), new RandomGhosts(), true);
 
 
 		//run game without time limits (un-comment if required)

diff --git a/game/entries/pacman/NearestPillAvoidPowerAction.java b/game/entries/pacman/NearestPillAvoidPowerAction.java
@@ -14,35 +14,43 @@ public int act(Game game) {
 		//get all active power pills
 		int[] activePowerPills = game.getPowerPillIndicesActive();
 
-		// find closest pill
-		int target = game.getTarget(current, activePills, true, Game.DM.PATH);
-
-		// find path from pacman to pill
-		int[] path = game.getPath(current, target);
-
-		boolean powerExists = false;
-		int powerLocation = -1;
-
-		// Check for a power pill in the path
-		for (int i = 0; (i < path.length) && !powerExists; i++) {
-			for (int j = 0; j < activePowerPills.length; j++) {
-				if (path[i] == activePowerPills[j]) {
-					powerExists = true;
-					powerLocation = activePowerPills[j];
-					break;
+		if (activePills.length > 0) {
+
+			// find closest pill
+			int target = game.getTarget(current, activePills, true, Game.DM.PATH);
+
+			// find path from pacman to pill
+			int[] path = game.getPath(current, target);
+
+			boolean powerExists = false;
+			int powerLocation = -1;
+
+			// Check for a power pill in the path
+			for (int i = 0; (i < path.length) && !powerExists; i++) {
+				for (int j = 0; j < activePowerPills.length; j++) {
+					if (path[i] == activePowerPills[j]) {
+						powerExists = true;
+						powerLocation = activePowerPills[j];
+						break;
+					}
 				}
 			}
+
+			// if power pill in path
+			// move away from power pill
+			if (powerExists) {
+				return game.getNextPacManDir(powerLocation, false, Game.DM.PATH);
+			}
+
+			// otherwise, head straight for the pill
+			else {
+				return game.getNextPacManDir(target, true, Game.DM.PATH);
+			}
 		}
 
-		// if power pill in path
-		// move away from power pill
-		if (powerExists) {
-			return game.getNextPacManDir(powerLocation, false, Game.DM.PATH);
-		}
-
-		// otherwise, head straight for the pill
+		// only power pills left
 		else {
-			return game.getNextPacManDir(target, true, Game.DM.PATH);
+			return game.getNextPacManDir(game.getTarget(current, activePowerPills, true, Game.DM.PATH), true, Game.DM.PATH);
 		}
 	}
 }