From 2b08df4476ce7befce2366b9a0fb27a80b989448 Mon Sep 17 00:00:00 2001
From: b22015516 <mehdi.belhachemi@etu.univ-amu.fr>
Date: Wed, 27 Nov 2024 15:03:37 +0100
Subject: [PATCH] improving code
---
src/main/java/model/Board/FirefighterBoard.java | 8 ++++----
.../java/model/Elements/Extinguisher/Extinguisher.java | 2 +-
src/main/java/model/Elements/ModelElement.java | 7 ++++---
src/main/java/view/ViewElement.java | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/model/Board/FirefighterBoard.java b/src/main/java/model/Board/FirefighterBoard.java
index 55fe8db..d2637f3 100644
--- a/src/main/java/model/Board/FirefighterBoard.java
+++ b/src/main/java/model/Board/FirefighterBoard.java
@@ -43,9 +43,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public void initializeElements() {
- obstacles.clear();
- extinguishers.clear();
- fires.clear();
for(ModelElement modelElement : ModelElement.values()){
for(int elementCount = 0; elementCount< modelElement.getInitialNumber();elementCount++){
Position position = randomPosition();
@@ -94,7 +91,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public List<Position> updateToNextGeneration() {
- Fire fire = new Fire(randomPosition());
+ Fire fire = new Fire(null);
List<Position> modifiedPositions = new ArrayList<>();
for(Extinguisher element : extinguishers.values()){
@@ -124,6 +121,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
@Override
public void reset() {
step = 0;
+ obstacles.clear();
+ extinguishers.clear();
+ fires.clear();
initializeElements();
}
diff --git a/src/main/java/model/Elements/Extinguisher/Extinguisher.java b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
index 13fe6e5..7d45c88 100644
--- a/src/main/java/model/Elements/Extinguisher/Extinguisher.java
+++ b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
@@ -25,12 +25,12 @@ public abstract class Extinguisher implements model.Elements.element {
public void setPosition(Position position) {
this.position = position;
-
}
public ModelElement getElement(){
return this.element;
}
+
public void extinguish(Board board, Position position) {
if (board.getFires().containsKey(position)) {
board.getFires().remove(position);
diff --git a/src/main/java/model/Elements/ModelElement.java b/src/main/java/model/Elements/ModelElement.java
index 0d7d50e..d133bb1 100644
--- a/src/main/java/model/Elements/ModelElement.java
+++ b/src/main/java/model/Elements/ModelElement.java
@@ -15,12 +15,14 @@ import util.Position;
public enum ModelElement {
FIREFIGHTER(5),
- FIRE(20),
+ FIRE(25),
CLOUD(10),
ROAD(5),
MOUNTAIN(5),
ROCAILLE(3),
- MOTORIZEDFIREFIGHTER(5);
+ MOTORIZEDFIREFIGHTER(3);
+
+
private final int initialNumber;
@@ -34,7 +36,6 @@ public enum ModelElement {
}
public element getModelElementClass(Position position){
-
return switch (this){
case FIRE -> new Fire(position);
case ROAD -> new Road(position);
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index a5db13a..62e3a45 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -6,7 +6,7 @@ public enum ViewElement {
FIREFIGHTER(Color.BLUE),
FIRE(Color.RED),
CLOUD(Color.LIGHTSKYBLUE),
- ROAD(Color.GRAY),
+ ROAD(Color.BLACK),
MOUNTAIN(Color.BROWN),
ROCAILLE(Color.GREEN),
--
GitLab