Added jumping logic, updated DefaultBoard and Player

fiicere · Sep 23, 2012 · 2174f89 · 2174f89
1 parent f279756
commit 2174f89
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/DefaultBoard.java b/Mazebuilder/src/com/mazebuilder/gameplay/DefaultBoard.java
@@ -110,7 +110,30 @@ public Location movePlayer(Player p, Direction d) {
 
     @Override
     public Location jumpPlayer(Player p, Direction d, Direction... bonusesToSpend) {
-        throw new RuntimeException("Not implemented.");
+        Preconditions.checkArgument(p.canJump(), "Player " + p.getName() + " cannot jump walls.");
+        Location l = getPlayerLocation(p);
+        if (walls.isWall(l, d)) {
+            Location moved = l.move(d);
+            if (isBoardLocation(moved)) {
+                Preconditions.checkArgument(bonusesToSpend.length == p.bonusesToJump());
+                if (p.bonusesEqual() && bonusesToSpend.length > 0) {
+                    Preconditions.checkNotNull(bonusesToSpend[0]);
+                    Direction b = bonusesToSpend[0];
+                    for (Direction bonus : bonusesToSpend) {
+                        if (!b.equals(bonus)) {
+                            return l;
+                        }
+                    }
+                }
+
+                for (Direction bonus : bonusesToSpend) {
+                    p.spendBonus(bonus);
+                }
+                l = moved;
+                players.put(p, l);
+            }
+        }
+        return l;
     }
 
     @Override

diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/Player.java b/Mazebuilder/src/com/mazebuilder/gameplay/Player.java
@@ -18,6 +18,9 @@ public interface Player extends Renderable {
     /** Returns the number of bonuses the player needs to spend to jump a wall **/
     int bonusesToJump();
 
+    /** Returns true if the bonuses spent to jump should be equal, or false otherwise. **/
+    boolean bonusesEqual();
+
     /** Removes a bonus from the player. **/
     boolean spendBonus(Direction d);