Skip to content
Snippets Groups Projects
Commit a23b1cce authored by MEHDI's avatar MEHDI
Browse files

mehdi : added Rocaille class

parent a3ddf1f3
Branches
No related tags found
No related merge requests found
......@@ -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;
}
......
......@@ -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);
};
......
package model;
import util.Position;
public class Rocaille extends Obstacle{
public Rocaille(Position position) {
super(position);
this.element = ModelElement.ROCAILLE;
}
}
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment