Make garbage blocks non-traversable

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

4 files changed, 13 insertions, 12 deletions

diff --git a/src/docs/user.md b/src/docs/user.md
index 735daf5..cba47eb 100644
--- a/src/docs/user.md
+++ b/src/docs/user.md
@@ -69,8 +69,8 @@ Entity type Appearance   Pushable by bomb Traversable by robot
 ----------- ------------ ---------------- --------------------
 Wall        Black square No               No
 Trash can   Red square   No               No
+Bomb        Black disk   No               No
 Free        Empty        No               Yes
-Bomb        Black disk   No               Yes
 Garbage     Brown disk   Yes              Yes
 Robot       Blue disk    /                /
 
@@ -105,8 +105,8 @@ Wall        W         Yes      No
 A world is defined as valid if its blocks fulfill the following criteria:
 
 * The bounding box of the defined world must be made of bounding blocks.
-* The interior space formed by bounding blocks must be unique and simple.
-* Reachable blocks are either adjacent or belong to the interior space.
+* The interior space formed by traversable blocks must be unique and simple.
+* Reachable blocks are either adjacent or belonging to the interior space.
 * The world must contain at least one trash can and one garbage block.
 * The world must have enough free tiles to contain all droppable bombs.
 
@@ -118,11 +118,11 @@ The validity of a world may not guaranty the solvability of the puzzle.
 
 __Example of invalid world definition:__
 ```
-WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW
-W                              W                               W
-W                              W                               W    T
-                      WWWWWWWWWW                               W
-                      W        W                               W
+WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW         W
+W                              W                               W   WWW   W
+W                              W                               W   WTW   W
+                      WWWWWWWWWW                               W   WWW   W
+                      W        W                               W         W
                       W        W                               WWWWWWWWWWW
                       WWWWWWWWWW                                         W
 W                              W                                         W
@@ -137,7 +137,7 @@ W                                                              WWWWWWWWWWW
 W                                                              WWWWWWWWWWW
 T                     WWWWWWWWWW                               WWWWWWWWWWW
 T                     WWWWWWWWWW        GGGGGGGGGGGGG          WWWWWWWWWWW
-T                     WWWWWWWWWW        GGGGGGGG    G          WWWWWWWWWWW
+T                     WWWWWWWWWW        GGGGGGGG               WWWWWWWWWWW
 T                     WWWWWWWWWW        GGGGGGGGGGGGG                    W
 W                              W                                         W
 W                              W                                         W
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
index e238955..e95446b 100644
--- a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
+++ b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
@@ -91,7 +91,8 @@ public class BoardValidator {
              .filter(blockEntry -> blockEntry.getValue().mustBeReachable())
              .allMatch(blockEntry -> blockEntry.getKey().neighbors().stream()
                                      .filter(neighbor -> inBoard(dim, neighbor))
-                                     .anyMatch(neighbor -> b.getBlockTypeAt(neighbor).isTraversable()));
+                                     .anyMatch(neighbor -> b.getBlockTypeAt(neighbor).isTraversable() ||
+                                                           b.getBlockTypeAt(neighbor).isMovableByExplosion()));
     }
 
     /**
diff --git a/src/main/java/fr/umlv/java/wallj/model/BlockType.java b/src/main/java/fr/umlv/java/wallj/model/BlockType.java
index 9051715..9c5d4f5 100644
--- a/src/main/java/fr/umlv/java/wallj/model/BlockType.java
+++ b/src/main/java/fr/umlv/java/wallj/model/BlockType.java
@@ -10,7 +10,7 @@ public enum BlockType {
   FREE(false, true, true, false),
   WALL(true, false, false, false),
   TRASH(true, true, false, false),
-  GARBAGE(false, true, true, true),
+  GARBAGE(false, true, false, true),
   ROBOT(false, false, true, false),
   BOMB(false, false, true, false);
 
diff --git a/src/test/resources/maps/bigValid.txt b/src/test/resources/maps/bigValid.txt
index 45bcacf..80c83fc 100644
--- a/src/test/resources/maps/bigValid.txt
+++ b/src/test/resources/maps/bigValid.txt
@@ -3,7 +3,7 @@ W                                                              WWWWWWWWWWW
 W                                                              WWWWWWWWWWW
 T                     WWWWWWWWWW                               WWWWWWWWWWW
 T                     WWWWWWWWWW        GGGGGGGGGGGGG          WWWWWWWWWWW
-T                     WWWWWWWWWW        GGGGGGGG    G          WWWWWWWWWWW
+T                     WWWWWWWWWW        GGGGGGGG               WWWWWWWWWWW
 T                     WWWWWWWWWW        GGGGGGGGGGGGG                    W
 W                              W                                         W
 W                              W                                         W