From 18c195a0231cabe4196f358e214d0800b96ffded Mon Sep 17 00:00:00 2001
From: Yanis OUALAN <oualanyanis01@gmail.com>
Date: Fri, 29 Nov 2024 12:05:32 +0100
Subject: [PATCH] Correctifs
---
build/resources/main/view/view.fxml | 12 ++++++++++++
src/main/java/controller/Controller.java | 2 +-
.../java/model/firefighterscenario/FireFighter.java | 2 +-
.../firefighterscenario/FireFighterScenario.java | 4 ++--
src/main/resources/view/view.fxml | 12 ++++++++++++
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/build/resources/main/view/view.fxml b/build/resources/main/view/view.fxml
index 6c1059b..7a2adc4 100644
--- a/build/resources/main/view/view.fxml
+++ b/build/resources/main/view/view.fxml
@@ -38,6 +38,18 @@
mnemonicParsing="false" onAction="#pauseToggleButtonAction"
prefHeight="24.0" prefWidth="200.0"
styleClass="button" text="Pause" />
+ <ToggleButton fx:id="initFireFighter" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializeFireFighter"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start FireFighter" />
+ <ToggleButton fx:id="initVirus" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializeDoctor"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start Virus" />
+ <ToggleButton fx:id="initPfc" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializePfc"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start RockPaperCisor" />
</VBox>
<FirefighterGrid fx:id="grid"
xmlns="http://javafx.com/javafx"
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index be8e27a..757a486 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -188,7 +188,7 @@ public class Controller {
entityCounts.put((pos, b) -> new model.firefighterscenario.Rockery(pos), SimulatorApplication.INITIAL_ROCKERTY_COUNT);
- Model model = new model.doctorviruspatient.DoctorVirusPatientScenario(SimulatorApplication.COLUMN_COUNT, SimulatorApplication.ROW_COUNT, entityCounts);
+ Model model = new model.firefighterscenario.FireFighterScenario(SimulatorApplication.COLUMN_COUNT, SimulatorApplication.ROW_COUNT, entityCounts);
this.setModel(model);
repaintGrid();
}
diff --git a/src/main/java/model/firefighterscenario/FireFighter.java b/src/main/java/model/firefighterscenario/FireFighter.java
index 7403803..6dc529d 100644
--- a/src/main/java/model/firefighterscenario/FireFighter.java
+++ b/src/main/java/model/firefighterscenario/FireFighter.java
@@ -32,7 +32,7 @@ public class FireFighter implements Entity {
public FireFighter(Position position, Board<Square> b) {
this.position = position;
- this.age = 0;
+ this.age = -2;
this.lastThreePosition = new ArrayList<Position>();
}
diff --git a/src/main/java/model/firefighterscenario/FireFighterScenario.java b/src/main/java/model/firefighterscenario/FireFighterScenario.java
index 05167ea..f3d0661 100644
--- a/src/main/java/model/firefighterscenario/FireFighterScenario.java
+++ b/src/main/java/model/firefighterscenario/FireFighterScenario.java
@@ -30,11 +30,11 @@ public class FireFighterScenario extends Scenario implements Model{
Square s = iterator.next();
if (s.isEmpty())
continue;
- if (s.getMaxAge() == 0) {
+ if (s.getMaxAge() == 0 && step > 0) {
s.incrementAllAges();
continue;
}
- if (s.getMaxAge() == step + 1) {
+ if (s.getMaxAge() == step + 1 && step> 0) {
continue;
}
List<Entity> entities = new ArrayList<>(s.getEntities());
diff --git a/src/main/resources/view/view.fxml b/src/main/resources/view/view.fxml
index 6c1059b..7a2adc4 100644
--- a/src/main/resources/view/view.fxml
+++ b/src/main/resources/view/view.fxml
@@ -38,6 +38,18 @@
mnemonicParsing="false" onAction="#pauseToggleButtonAction"
prefHeight="24.0" prefWidth="200.0"
styleClass="button" text="Pause" />
+ <ToggleButton fx:id="initFireFighter" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializeFireFighter"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start FireFighter" />
+ <ToggleButton fx:id="initVirus" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializeDoctor"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start Virus" />
+ <ToggleButton fx:id="initPfc" maxHeight="-Infinity" maxWidth="-Infinity"
+ mnemonicParsing="false" onAction="#initializePfc"
+ prefHeight="24.0" prefWidth="200.0"
+ styleClass="button" text="Start RockPaperCisor" />
</VBox>
<FirefighterGrid fx:id="grid"
xmlns="http://javafx.com/javafx"
--
GitLab