diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index ac18882cc072af0e0924338e9474aa9bc761d15a..577a4d1b61b6549cc40de56754b20fc09414e35a 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -97,6 +97,9 @@ public class Controller { if (squareState.contains(ModelElement.MOUNTAIN)) { return ViewElement.MOUNTAIN; } + if (squareState.contains(ModelElement.ROCAILLE)) { + return ViewElement.ROCAILLE; + } return ViewElement.EMPTY; } diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java index 4fdb6d94a2ed06fc1d6f260d47699b3652263460..4aa440eb68e2a60b35775607c1bb663b766596be 100644 --- a/src/main/java/model/ModelElement.java +++ b/src/main/java/model/ModelElement.java @@ -11,7 +11,8 @@ public enum ModelElement { FIRE(10), CLOUD(10), ROAD(5), - MOUNTAIN(5); + MOUNTAIN(5), + ROCAILLE(3); private final int initialNumber; @@ -32,6 +33,7 @@ public enum ModelElement { case FIREFIGHTER -> new FireFighter(position); case CLOUD -> new Cloud(position); case MOUNTAIN -> new Montain(position); + case ROCAILLE -> new Rocaille(position); default -> throw new IllegalArgumentException("Unknown ModelElement: " + this); }; diff --git a/src/main/java/model/Rocaille.java b/src/main/java/model/Rocaille.java new file mode 100644 index 0000000000000000000000000000000000000000..f321e3461596e32e7950132ceb55537510ff2765 --- /dev/null +++ b/src/main/java/model/Rocaille.java @@ -0,0 +1,10 @@ +package model; + +import util.Position; + +public class Rocaille extends Obstacle{ + public Rocaille(Position position) { + super(position); + this.element = ModelElement.ROCAILLE; + } +} diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java index 7cc068347513a014254e29ec27250ffd8a3b72e9..57b2b151c0d08426ad375b6e59b88e11ddb304be 100644 --- a/src/main/java/view/ViewElement.java +++ b/src/main/java/view/ViewElement.java @@ -3,7 +3,14 @@ package view; import javafx.scene.paint.Color; public enum ViewElement { - FIREFIGHTER(Color.BLUE), FIRE(Color.RED),CLOUD(Color.LIGHTSKYBLUE),ROAD(Color.GRAY),MOUNTAIN(Color.BROWN), EMPTY(Color.WHITE); + FIREFIGHTER(Color.BLUE), + FIRE(Color.RED), + CLOUD(Color.LIGHTSKYBLUE), + ROAD(Color.GRAY), + MOUNTAIN(Color.BROWN), + + ROCAILLE(Color.GREEN), + EMPTY(Color.WHITE); final Color color; ViewElement(Color color) { this.color = color;