Merge remote-tracking branch 'origin/master' into algorithm

src/pathgame/gameplay/Player.java

@@ -32,7 +32,7 @@ public class Player
     {
         this.energySupply = energySupply;
         this.objectivesAmount = objectivesAmount;
-        abilities = PlayerAbilities.SWIMMER;
+        abilities = PlayerAbilities.NORMAL;
     }
 
     public float getLastX()

src/pathgame/gameplay/PlayerAbilities.java

@@ -22,6 +22,7 @@ public class PlayerAbilities
         this.fasterSwamp = fasterSwamp;
     }
 
+    public final static PlayerAbilities NORMAL = new PlayerAbilities(0, 0, 0, 0, 0, 0, 0);
     public final static PlayerAbilities HIKER = new PlayerAbilities(0, 0, 0, 0, 1, 0, 0);
     public final static PlayerAbilities CLIMBER = new PlayerAbilities(0, 0, 0, 0, 0, 1, 0);
     public final static PlayerAbilities FOREST = new PlayerAbilities(0, 1, 0, 0, 0, 0, 0);