From a23b1cce899b90c680dfc7f6e270239f536b3910 Mon Sep 17 00:00:00 2001
From: MEHDI <mehdi.belhachemi@etu-univ.amu.fr>
Date: Sun, 24 Nov 2024 19:18:19 +0100
Subject: [PATCH] mehdi : added Rocaille class
---
src/main/java/controller/Controller.java | 3 +++
src/main/java/model/ModelElement.java | 4 +++-
src/main/java/model/Rocaille.java | 10 ++++++++++
src/main/java/view/ViewElement.java | 9 ++++++++-
4 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/model/Rocaille.java
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index ac18882..577a4d1 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 4fdb6d9..4aa440e 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 0000000..f321e34
--- /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 7cc0683..57b2b15 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;
--
GitLab