5 files changed, 90 insertions, 99 deletions
diff --git a/src/ch/epfl/maze/physical/pacman/Blinky.java b/src/ch/epfl/maze/physical/pacman/Blinky.java
index 22ef16f..d70f444 100644
--- a/src/ch/epfl/maze/physical/pacman/Blinky.java
+++ b/src/ch/epfl/maze/physical/pacman/Blinky.java
@@ -8,32 +8,30 @@ import ch.epfl.maze.util.Vector2D;
 /**
 * Red ghost from the Pac-Man game, chases directly its target.
- * 
 */
 public class Blinky extends Predator {
-        /**
+    /**
-         * Constructs a Blinky with a starting position.
+     * Constructs a Blinky with a starting position.
-         * 
+     *
-         * @param position
+     * @param position Starting position of Blinky in the labyrinth
-         *            Starting position of Blinky in the labyrinth
+     */
-         */
-        public Blinky(Vector2D position) {
+    public Blinky(Vector2D position) {
-                super(position);
+        super(position);
-                // TODO
+        // TODO
-        }
+    }
-        @Override
+    @Override
-        public Direction move(Direction[] choices, Daedalus daedalus) {
+    public Direction move(Direction[] choices, Daedalus daedalus) {
-                // TODO
+        // TODO
-                return Direction.NONE;
+        return Direction.NONE;
-        }
+    }
-        @Override
+    @Override
-        public Animal copy() {
+    public Animal copy() {
-                // TODO
+        // TODO
-                return null;
+        return null;
-        }
+    }
 }
diff --git a/src/ch/epfl/maze/physical/pacman/Clyde.java b/src/ch/epfl/maze/physical/pacman/Clyde.java
index 4da35d8..8b3fd20 100644
--- a/src/ch/epfl/maze/physical/pacman/Clyde.java
+++ b/src/ch/epfl/maze/physical/pacman/Clyde.java
@@ -9,32 +9,30 @@ import ch.epfl.maze.util.Vector2D;
 /**
 * Orange ghost from the Pac-Man game, alternates between direct chase if far
 * from its target and SCATTER if close.
- * 
 */
 public class Clyde extends Predator {
-        /**
+    /**
-         * Constructs a Clyde with a starting position.
+     * Constructs a Clyde with a starting position.
-         * 
+     *
-         * @param position
+     * @param position Starting position of Clyde in the labyrinth
-         *            Starting position of Clyde in the labyrinth
+     */
-         */
-        public Clyde(Vector2D position) {
+    public Clyde(Vector2D position) {
-                super(position);
+        super(position);
-                // TODO
+        // TODO
-        }
+    }
-        @Override
+    @Override
-        public Direction move(Direction[] choices, Daedalus daedalus) {
+    public Direction move(Direction[] choices, Daedalus daedalus) {
-                // TODO
+        // TODO
-                return Direction.NONE;
+        return Direction.NONE;
-        }
+    }
-        @Override
+    @Override
-        public Animal copy() {
+    public Animal copy() {
-                // TODO
+        // TODO
-                return null;
+        return null;
-        }
+    }
 }
diff --git a/src/ch/epfl/maze/physical/pacman/Inky.java b/src/ch/epfl/maze/physical/pacman/Inky.java
index 87d9626..883c385 100644
--- a/src/ch/epfl/maze/physical/pacman/Inky.java
+++ b/src/ch/epfl/maze/physical/pacman/Inky.java
@@ -9,32 +9,30 @@ import ch.epfl.maze.util.Vector2D;
 /**
 * Blue ghost from the Pac-Man game, targets the result of two times the vector
 * from Blinky to its target.
- * 
 */
 public class Inky extends Predator {
-        /**
+    /**
-         * Constructs a Inky with a starting position.
+     * Constructs a Inky with a starting position.
-         * 
+     *
-         * @param position
+     * @param position Starting position of Inky in the labyrinth
-         *            Starting position of Inky in the labyrinth
+     */
-         */
-        public Inky(Vector2D position) {
+    public Inky(Vector2D position) {
-                super(position);
+        super(position);
-                // TODO
+        // TODO
-        }
+    }
-        @Override
+    @Override
-        public Direction move(Direction[] choices, Daedalus daedalus) {
+    public Direction move(Direction[] choices, Daedalus daedalus) {
-                // TODO
+        // TODO
-                return Direction.NONE;
+        return Direction.NONE;
-        }
+    }
-        @Override
+    @Override
-        public Animal copy() {
+    public Animal copy() {
-                // TODO
+        // TODO
-                return null;
+        return null;
-        }
+    }
 }
diff --git a/src/ch/epfl/maze/physical/pacman/PacMan.java b/src/ch/epfl/maze/physical/pacman/PacMan.java
index 0bdd156..bb167af 100644
--- a/src/ch/epfl/maze/physical/pacman/PacMan.java
+++ b/src/ch/epfl/maze/physical/pacman/PacMan.java
@@ -8,25 +8,24 @@ import ch.epfl.maze.util.Vector2D;
 /**
 * Pac-Man character, from the famous game of the same name.
- * 
 */
 public class PacMan extends Prey {
-        public PacMan(Vector2D position) {
+    public PacMan(Vector2D position) {
-                super(position);
+        super(position);
-                // TODO
+        // TODO
-        }
+    }
-        @Override
+    @Override
-        public Direction move(Direction[] choices, Daedalus daedalus) {
+    public Direction move(Direction[] choices, Daedalus daedalus) {
-                // TODO
+        // TODO
-                return Direction.NONE;
+        return Direction.NONE;
-        }
+    }
-        @Override
+    @Override
-        public Animal copy() {
+    public Animal copy() {
-                // TODO
+        // TODO
-                return null;
+        return null;
-        }
+    }
 }
diff --git a/src/ch/epfl/maze/physical/pacman/Pinky.java b/src/ch/epfl/maze/physical/pacman/Pinky.java
index 9a64a53..aaa2720 100644
--- a/src/ch/epfl/maze/physical/pacman/Pinky.java
+++ b/src/ch/epfl/maze/physical/pacman/Pinky.java
@@ -8,32 +8,30 @@ import ch.epfl.maze.util.Vector2D;
 /**
 * Pink ghost from the Pac-Man game, targets 4 squares in front of its target.
- * 
 */
 public class Pinky extends Predator {
-        /**
+    /**
-         * Constructs a Pinky with a starting position.
+     * Constructs a Pinky with a starting position.
-         * 
+     *
-         * @param position
+     * @param position Starting position of Pinky in the labyrinth
-         *            Starting position of Pinky in the labyrinth
+     */
-         */
-        public Pinky(Vector2D position) {
+    public Pinky(Vector2D position) {

diff --git a/src/ch/epfl/maze/physical/pacman/Blinky.java b/src/ch/epfl/maze/physical/pacman/Blinky.java index 22ef16f..d70f444 100644 --- a/src/ch/epfl/maze/physical/pacman/Blinky.java +++ b/src/ch/epfl/maze/physical/pacman/Blinky.java
@@ -8,32 +8,30 @@ import ch.epfl.maze.util.Vector2D;
8		8
9	/**	9	/**
10	* Red ghost from the Pac-Man game, chases directly its target.	10	* Red ghost from the Pac-Man game, chases directly its target.
11	*
12	*/	11	*/
13		12
14	public class Blinky extends Predator {	13	public class Blinky extends Predator {
15		14
16	/**	15	/**
17	* Constructs a Blinky with a starting position.	16	* Constructs a Blinky with a starting position.
18	*	17	*
19	* @param position	18	* @param position Starting position of Blinky in the labyrinth
20	* Starting position of Blinky in the labyrinth	19	*/
21	*/
22		20
23	public Blinky(Vector2D position) {	21	public Blinky(Vector2D position) {
24	super(position);	22	super(position);
25	// TODO	23	// TODO
26	}	24	}
27		25
28	@Override	26	@Override
29	public Direction move(Direction[] choices, Daedalus daedalus) {	27	public Direction move(Direction[] choices, Daedalus daedalus) {
30	// TODO	28	// TODO
31	return Direction.NONE;	29	return Direction.NONE;
32	}	30	}
33		31
34	@Override	32	@Override
35	public Animal copy() {	33	public Animal copy() {
36	// TODO	34	// TODO
37	return null;	35	return null;
38	}	36	}
39	}	37	}


diff --git a/src/ch/epfl/maze/physical/pacman/Clyde.java b/src/ch/epfl/maze/physical/pacman/Clyde.java index 4da35d8..8b3fd20 100644 --- a/src/ch/epfl/maze/physical/pacman/Clyde.java +++ b/src/ch/epfl/maze/physical/pacman/Clyde.java
@@ -9,32 +9,30 @@ import ch.epfl.maze.util.Vector2D;
9	/**	9	/**
10	* Orange ghost from the Pac-Man game, alternates between direct chase if far	10	* Orange ghost from the Pac-Man game, alternates between direct chase if far
11	* from its target and SCATTER if close.	11	* from its target and SCATTER if close.
12	*
13	*/	12	*/
14		13
15	public class Clyde extends Predator {	14	public class Clyde extends Predator {
16		15
17	/**	16	/**
18	* Constructs a Clyde with a starting position.	17	* Constructs a Clyde with a starting position.
19	*	18	*
20	* @param position	19	* @param position Starting position of Clyde in the labyrinth
21	* Starting position of Clyde in the labyrinth	20	*/
22	*/
23		21
24	public Clyde(Vector2D position) {	22	public Clyde(Vector2D position) {
25	super(position);	23	super(position);
26	// TODO	24	// TODO
27	}	25	}
28		26
29	@Override	27	@Override
30	public Direction move(Direction[] choices, Daedalus daedalus) {	28	public Direction move(Direction[] choices, Daedalus daedalus) {
31	// TODO	29	// TODO
32	return Direction.NONE;	30	return Direction.NONE;
33	}	31	}
34		32
35	@Override	33	@Override
36	public Animal copy() {	34	public Animal copy() {
37	// TODO	35	// TODO
38	return null;	36	return null;
39	}	37	}
40	}	38	}


diff --git a/src/ch/epfl/maze/physical/pacman/Inky.java b/src/ch/epfl/maze/physical/pacman/Inky.java index 87d9626..883c385 100644 --- a/src/ch/epfl/maze/physical/pacman/Inky.java +++ b/src/ch/epfl/maze/physical/pacman/Inky.java
@@ -9,32 +9,30 @@ import ch.epfl.maze.util.Vector2D;
9	/**	9	/**
10	* Blue ghost from the Pac-Man game, targets the result of two times the vector	10	* Blue ghost from the Pac-Man game, targets the result of two times the vector
11	* from Blinky to its target.	11	* from Blinky to its target.
12	*
13	*/	12	*/
14		13
15	public class Inky extends Predator {	14	public class Inky extends Predator {
16		15
17	/**	16	/**
18	* Constructs a Inky with a starting position.	17	* Constructs a Inky with a starting position.
19	*	18	*
20	* @param position	19	* @param position Starting position of Inky in the labyrinth
21	* Starting position of Inky in the labyrinth	20	*/
22	*/
23		21
24	public Inky(Vector2D position) {	22	public Inky(Vector2D position) {
25	super(position);	23	super(position);
26	// TODO	24	// TODO
27	}	25	}
28		26
29	@Override	27	@Override
30	public Direction move(Direction[] choices, Daedalus daedalus) {	28	public Direction move(Direction[] choices, Daedalus daedalus) {
31	// TODO	29	// TODO
32	return Direction.NONE;	30	return Direction.NONE;
33	}	31	}
34		32
35	@Override	33	@Override
36	public Animal copy() {	34	public Animal copy() {
37	// TODO	35	// TODO
38	return null;	36	return null;
39	}	37	}
40	}	38	}


diff --git a/src/ch/epfl/maze/physical/pacman/PacMan.java b/src/ch/epfl/maze/physical/pacman/PacMan.java index 0bdd156..bb167af 100644 --- a/src/ch/epfl/maze/physical/pacman/PacMan.java +++ b/src/ch/epfl/maze/physical/pacman/PacMan.java
@@ -8,25 +8,24 @@ import ch.epfl.maze.util.Vector2D;
8		8
9	/**	9	/**
10	* Pac-Man character, from the famous game of the same name.	10	* Pac-Man character, from the famous game of the same name.
11	*
12	*/	11	*/
13		12
14	public class PacMan extends Prey {	13	public class PacMan extends Prey {
15		14
16	public PacMan(Vector2D position) {	15	public PacMan(Vector2D position) {
17	super(position);	16	super(position);
18	// TODO	17	// TODO
19	}	18	}
20		19
21	@Override	20	@Override
22	public Direction move(Direction[] choices, Daedalus daedalus) {	21	public Direction move(Direction[] choices, Daedalus daedalus) {
23	// TODO	22	// TODO
24	return Direction.NONE;	23	return Direction.NONE;
25	}	24	}
26		25
27	@Override	26	@Override
28	public Animal copy() {	27	public Animal copy() {
29	// TODO	28	// TODO
30	return null;	29	return null;
31	}	30	}
32	}	31	}


diff --git a/src/ch/epfl/maze/physical/pacman/Pinky.java b/src/ch/epfl/maze/physical/pacman/Pinky.java index 9a64a53..aaa2720 100644 --- a/src/ch/epfl/maze/physical/pacman/Pinky.java +++ b/src/ch/epfl/maze/physical/pacman/Pinky.java
@@ -8,32 +8,30 @@ import ch.epfl.maze.util.Vector2D;
8		8
9	/**	9	/**
10	* Pink ghost from the Pac-Man game, targets 4 squares in front of its target.	10	* Pink ghost from the Pac-Man game, targets 4 squares in front of its target.
11	*
12	*/	11	*/
13		12
14	public class Pinky extends Predator {	13	public class Pinky extends Predator {
15		14
16	/**	15	/**
17	* Constructs a Pinky with a starting position.	16	* Constructs a Pinky with a starting position.
18	*	17	*
19	* @param position	18	* @param position Starting position of Pinky in the labyrinth
20	* Starting position of Pinky in the labyrinth	19	*/
21	*/
22		20
23	public Pinky(Vector2D position) {	21	public Pinky(Vector2D position) {
24