Handle bomb drop

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

4 files changed, 31 insertions, 17 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
index baf10b3..ac63a87 100644
--- a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
@@ -13,6 +13,7 @@ import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A bomb block.
@@ -42,13 +43,15 @@ public class BombBlock extends JBoxBlock {
 
   @Override
   public List<Event> update(Context context) {
-    if (containsUpdateEvent(context.getEvents())) incrementTimer();
+    handleBombConfiguration(context.getEvents());
     paint(context.getGraphicsContext());
     return consume(context.getTimeDelta());
   }
 
-  private boolean containsUpdateEvent(List<Event> events) {
-    return Events.findFirst(events, BombSetupEvent.class).isPresent();
+  private void handleBombConfiguration(List<Event> events) {
+    Events.findFirst(events, BombTimerIncrEvent.class)
+    .filter(event -> Objects.equals(event.getPos(), TileVec2.of(getPos())))
+    .ifPresent(event -> incrementTimer());
   }
 
   private List<Event> consume(Duration timeDelta) {
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 45ed5bd..0969009 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -5,6 +5,7 @@ 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.context.Stage;
 import fr.umlv.java.wallj.event.*;
 import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
@@ -12,9 +13,7 @@ import org.jbox2d.dynamics.World;
 
 import java.awt.*;
 import java.time.Duration;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.LinkedList;
+import java.util.*;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ import java.util.List;
  * @author Pacien TRAN-GIRARD
  */
 public class RobotBlock extends Block {
-  private static final float SPEED = 0.2f; // px/ms
+  private static final float SPEED = 4f; // px/ms
 
   private Vec2 pos;
   private PathFinder pathFinder;
@@ -56,12 +55,14 @@ public class RobotBlock extends Block {
 
     move(context.getTimeDelta());
     paint(context.getGraphicsContext());
-    return setupBomb(context.getEvents());
+    return setupBomb(context.getEvents(), context.getGame().getCurrentStage());
   }
 
-  private List<Event> setupBomb(List<Event> events) {
+  private List<Event> setupBomb(List<Event> events, Stage stage) {
     return Events.findFirst(events, BombSetupOrder.class)
-           .map(event -> Collections.<Event>singletonList(new BombSetupEvent(TileVec2.of(pos))))
+           .map(event -> isOnBomb(stage) ?
+                         Collections.<Event>singletonList(new BombTimerIncrEvent(getTile())) :
+                         Collections.<Event>singletonList(new BlockCreateEvent(BlockType.BOMB, getTile())))
            .orElse(Collections.emptyList());
   }
 
@@ -83,4 +84,10 @@ public class RobotBlock extends Block {
   private void paint(GraphicsContext graphicsContext) {
     graphicsContext.paintCircle(Color.BLUE, getPos(), TileVec2.TILE_DIM / 2);
   }
+
+  private boolean isOnBomb(Stage stage) {
+    return stage.getBlocks().stream()
+           .anyMatch(block -> Objects.equals(block.getType(), BlockType.BOMB) &&
+                              Objects.equals(block.getPos(), getTile().toVec2()));
+  }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/context/Stage.java b/src/main/java/fr/umlv/java/wallj/context/Stage.java
index 8ef4558..49aa196 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Stage.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Stage.java
@@ -11,10 +11,7 @@ import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.World;
 
 import java.time.Duration;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author Pacien TRAN-GIRARD
@@ -52,6 +49,13 @@ public class Stage implements Updateable {
   }
 
   /**
+   * @return the list of blocks
+   */
+  public List<Block> getBlocks() {
+    return Collections.unmodifiableList(blocks);
+  }
+
+  /**
    * @return T(this stage is cleared, i.e. does not contain any garbage block)
    * @implNote TODO: profile this and consider a garbage block counter
    */
diff --git a/src/main/java/fr/umlv/java/wallj/event/BombSetupEvent.java b/src/main/java/fr/umlv/java/wallj/event/BombTimerIncrEvent.java
index 620eea2..cbfe6e5 100644
--- a/src/main/java/fr/umlv/java/wallj/event/BombSetupEvent.java
+++ b/src/main/java/fr/umlv/java/wallj/event/BombTimerIncrEvent.java
@@ -5,17 +5,17 @@ import fr.umlv.java.wallj.board.TileVec2;
 import java.util.Objects;
 
 /**
- * Bomb setup event signalling the creation or the update of a bomb at a given position.
+ * Bomb setup event signalling the update of a bomb at a given position.
  *
  * @author Pacien TRAN-GIRARD
  */
-public final class BombSetupEvent implements GameEvent {
+public final class BombTimerIncrEvent implements GameEvent {
   private final TileVec2 pos;
 
   /**
    * @param pos requested setup position
    */
-  public BombSetupEvent(TileVec2 pos) {
+  public BombTimerIncrEvent(TileVec2 pos) {
     this.pos = Objects.requireNonNull(pos);
   }