Rename events/orders ; Partial impl. of robot event handling

Signed-off-by: pacien <pacien.trangirard@pacien.net>

12 files changed, 97 insertions, 62 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
index 45c75da..c011f27 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -1,13 +1,19 @@
 package fr.umlv.java.wallj.block;
 
+import fr.umlv.java.wallj.board.Board;
+import fr.umlv.java.wallj.board.PathFinder;
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.context.GraphicsContext;
+import fr.umlv.java.wallj.event.BombSetupEvent;
+import fr.umlv.java.wallj.event.BombSetupOrder;
 import fr.umlv.java.wallj.event.Event;
+import fr.umlv.java.wallj.event.MoveRobotOrder;
 import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.World;
 
 import java.awt.*;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 
@@ -21,6 +27,7 @@ public class RobotBlock extends Block {
 
   private Vec2 pos;
   private List<TileVec2> path = Collections.emptyList();
+  private PathFinder pathFinder;
 
   RobotBlock(Vec2 pos) {
     super(BlockType.ROBOT);
@@ -39,21 +46,27 @@ public class RobotBlock extends Block {
 
   @Override
   public List<Event> update(Context context) {
-    updatePath(context.getEvents());
-    if (!path.isEmpty()) move();
+    Event.findFirst(context.getEvents(), MoveRobotOrder.class)
+    .ifPresent(event -> updatePath(context.getGame().getCurrentStage().getBoard(), event.getTarget()));
+
+    if (!path.isEmpty()) move(context.getTimeDelta());
     paint(context.getGraphicsContext());
     return setupBomb(context.getEvents());
   }
 
   private List<Event> setupBomb(List<Event> events) {
-    return Collections.emptyList(); // TODO: return a SetupBombEvent at current location if an order was received
+    return Event.findFirst(events, BombSetupOrder.class)
+           .map(event -> Collections.<Event>singletonList(new BombSetupEvent(TileVec2.of(pos))))
+           .orElse(Collections.emptyList());
   }
 
-  private void updatePath(List<Event> events) {
-    // TODO: update path if received a new target event (using the pathfinder)
+  private void updatePath(Board board, TileVec2 target) {
+    if (!board.getBlockTypeAt(target).isTraversable()) return;
+    if (pathFinder == null) pathFinder = new PathFinder(board);
+    path = pathFinder.findPath(TileVec2.of(pos), target);
   }
 
-  private void move() {
+  private void move(Duration timeDelta) {
     // TODO: follow the current path
   }
 
diff --git a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java b/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
index 1a64667..64591df 100644
--- a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
+++ b/src/main/java/fr/umlv/java/wallj/context/InputHandler.java
@@ -1,8 +1,8 @@
 package fr.umlv.java.wallj.context;
 
 import fr.umlv.java.wallj.board.TileVec2;
-import fr.umlv.java.wallj.event.DropBombEvent;
-import fr.umlv.java.wallj.event.MoveRobotEvent;
+import fr.umlv.java.wallj.event.BombSetupOrder;
+import fr.umlv.java.wallj.event.MoveRobotOrder;
 import fr.umlv.zen5.ApplicationContext;
 import fr.umlv.zen5.Event;
 import fr.umlv.zen5.KeyboardKey;
@@ -43,7 +43,7 @@ public final class InputHandler {
         if (action == Event.Action.POINTER_DOWN) {
           Vec2 mouseLocation = new Vec2(location.x, location.y);
           TileVec2 mouseTileLocation = TileVec2.of(mouseLocation);
-          events.add(new MoveRobotEvent(mouseTileLocation));
+          events.add(new MoveRobotOrder(mouseTileLocation));
         }
       }
       KeyboardKey keyboardKey = event.getKey();
@@ -51,7 +51,7 @@ public final class InputHandler {
         if (action == Event.Action.KEY_PRESSED) {
           switch (keyboardKey) {
             case SPACE:
-              events.add(new DropBombEvent());
+              events.add(new BombSetupOrder());
               break;
           }
         }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
index 2c548f2..c2c28a7 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/GameStateController.java
@@ -2,7 +2,7 @@ package fr.umlv.java.wallj.controller;
 
 import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.context.Game;
-import fr.umlv.java.wallj.event.ConfirmEvent;
+import fr.umlv.java.wallj.event.ConfirmOrder;
 import fr.umlv.java.wallj.event.Event;
 import fr.umlv.java.wallj.event.GameOverEvent;
 
@@ -13,7 +13,7 @@ public class GameStateController implements Controller {
 
   @Override
   public List<Event> update(Context context) {
-    boolean isConfirmEvent = context.getEvents().stream().anyMatch(event -> event instanceof ConfirmEvent);
+    boolean isConfirmEvent = context.getEvents().stream().anyMatch(event -> event instanceof ConfirmOrder);
     boolean isGameOver = context.getEvents().stream().allMatch(event -> event instanceof GameOverEvent);
     Game currentGame = context.getGame();
     LinkedList<Event> events = new LinkedList<>();
diff --git a/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java b/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java
deleted file mode 100644
index 10581ff..0000000
--- a/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package fr.umlv.java.wallj.event;
-
-import fr.umlv.java.wallj.board.TileVec2;
-
-import java.util.Objects;
-
-/**
- * Event to put a bomb on the game board
- *
- * @author Adam NAILI
- */
-public final class AddBombEvent implements InputEvent {
-  TileVec2 tileVec2;
-
-  /**
-   * @param tileVec2 a vector with coordinate relative to the tile
-   */
-  public AddBombEvent(TileVec2 tileVec2) {
-    this.tileVec2 = Objects.requireNonNull(tileVec2);
-  }
-}
diff --git a/src/main/java/fr/umlv/java/wallj/event/BombSetupEvent.java b/src/main/java/fr/umlv/java/wallj/event/BombSetupEvent.java
new file mode 100644
index 0000000..2e5cf98
--- /dev/null
+++ b/src/main/java/fr/umlv/java/wallj/event/BombSetupEvent.java
@@ -0,0 +1,28 @@
+package fr.umlv.java.wallj.event;
+
+import fr.umlv.java.wallj.board.TileVec2;
+
+import java.util.Objects;
+
+/**
+ * Bomb setup event.
+ *
+ * @author Pacien TRAN-GIRARD
+ */
+public final class BombSetupEvent implements GameEvent {
+  private final TileVec2 pos;
+
+  /**
+   * @param pos requested setup position
+   */
+  public BombSetupEvent(TileVec2 pos) {
+    this.pos = Objects.requireNonNull(pos);
+  }
+
+  /**
+   * @return the setup position
+   */
+  public TileVec2 getPos() {
+    return pos;