diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java index a3b7996590737c56174cfc1539078b8028b19bbe..35f5bd1beb70bf8580fcad77a6d1d8462524bcc8 100644 --- a/src/main/java/app/SimulatorApplication.java +++ b/src/main/java/app/SimulatorApplication.java @@ -23,6 +23,7 @@ public class SimulatorApplication extends javafx.application.Application { private Stage primaryStage; private Parent view; + private void initializePrimaryStage(Stage primaryStage) { this.primaryStage = primaryStage; this.primaryStage.setTitle(APP_NAME); @@ -45,7 +46,7 @@ public class SimulatorApplication extends javafx.application.Application { view = loader.load(); Controller controller = loader.getController(); controller.initialize(BOX_WIDTH, BOX_HEIGHT, COLUMN_COUNT, ROW_COUNT, - INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT, INITIAL_CLOUD_COUNT); + INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT); } private void showScene() { diff --git a/src/main/java/model/EmptySquare.java b/src/main/java/model/EmptySquare.java index 113ea0a394870345e6520690e083b03c9bb70a7c..1fff9c1aecc10deab3c0515e3a49b9630df5e5e1 100644 --- a/src/main/java/model/EmptySquare.java +++ b/src/main/java/model/EmptySquare.java @@ -6,21 +6,24 @@ import java.util.List; import javafx.scene.paint.Color; import util.Position; -public class EmptySquare implements Entity{ +public class EmptySquare implements Entity { private Position position; private final Color viewColor = Color.WHITE; private int age; - public EmptySquare(Position p){ + + public EmptySquare(Position p) { this.position = p; this.age = -999; } - public EmptySquare(Position p, int age){ + + public EmptySquare(Position p, int age) { this.position = p; this.age = age; } + @Override - public List<Position> nextTurn(Board<Entity> board) { + public List<Position> nextTurn(Board<Square> board) { return new ArrayList<Position>(); } @@ -33,10 +36,11 @@ public class EmptySquare implements Entity{ public void setPosition(Position p) { this.position = p; } - - public Color getViewColor(){ + + public Color getViewColor() { return this.viewColor; } + @Override public int getAge() { return this.age; @@ -46,4 +50,9 @@ public class EmptySquare implements Entity{ public void incrementAge() { age = age + 1; } + + @Override + public void setAge(int age) { + this.age = age; + } } diff --git a/src/main/java/model/FireFighterScenario.java b/src/main/java/model/FireFighterScenario.java index a23793e8e59d784505f1f3f7857b86aac5450fab..fadd6bceaf191fdcff9718e321079150929f3be7 100644 --- a/src/main/java/model/FireFighterScenario.java +++ b/src/main/java/model/FireFighterScenario.java @@ -120,9 +120,6 @@ public class FireFighterScenario extends EntityScenario implements Board<Square> return matrix.getRows(); } - public int columnCount() { - return matrix.getColumns(); - public int columnCount() { return matrix.getColumns(); } diff --git a/src/main/java/model/Scenario.java b/src/main/java/model/Scenario.java index b7f97edde1a79e4a136bded306b605b1fc43e02e..03d319a9325df2547e011ba58d5243e34f116b13 100644 --- a/src/main/java/model/Scenario.java +++ b/src/main/java/model/Scenario.java @@ -3,9 +3,6 @@ package model; import util.Matrix; public interface Scenario { -<<<<<<< HEAD public void initScenario(Matrix<Square> matrix); -======= - public void initScenario(Matrix<Entity> matrix); ->>>>>>> d8a3bf456f5b3471a26e38f4c2d9f5ccef27b158 -} + +} \ No newline at end of file diff --git a/src/main/java/model/cloud.java b/src/main/java/model/cloud.java deleted file mode 100644 index b11b9932d430732848f1c7bf298f8b8782812c63..0000000000000000000000000000000000000000 --- a/src/main/java/model/cloud.java +++ /dev/null @@ -1,94 +0,0 @@ -package model; - -import javafx.scene.paint.Color; -import util.Position; -import util.PositionUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class cloud implements Entity{ - private int age; - private final Color viewColor = Color.GREY; - private Position position; - Board<Entity> b; - - public cloud (Position position, Board<Entity> b, int age){ - this.age = age; - this.position = position; - this.b = b; - } - - - - @Override - public List<Position> nextTurn(Board<Entity> b) { - List<Position> positions = new ArrayList<>(); - - // Générer les positions adjacentes valides - List<Position> possibleMoves = PositionUtil.generateAllAdjacentPositions(position, b); - - // Sélectionner une position aléatoire parmi les mouvements possibles - Position next_pos = possibleMoves.get(new Random().nextInt(possibleMoves.size())); - - // Vérifier l'état de la nouvelle position - ArrayList<Entity> nextEntities = b.getState(next_pos); - - positions.add(position); - positions.add(next_pos); - - // Si la nouvelle position contient un feu, éteindre le feu - if (nextEntities.contains(Fire.class)) { - extinguish(List.of(next_pos), b); - } - - - b.setState(this, next_pos); - - - - // Retourner la position mise à jour pour affichage ou suivi - return positions; - } - - - - - private List<Position> extinguish(List<Position> next_pos, Board<Entity> b) { - List<Position> extinguishedPositions = new ArrayList<>(); - - if (b.getState(next_pos.get(0)).contains(Fire.class)) { - b.clearCase(next_pos.get(0)); - extinguishedPositions.add(next_pos.get(0)); - } - - - return extinguishedPositions; - } - - @Override - public Position getPosition() { - return position; - } - - @Override - public void setPosition(Position p) { - this.position = p; - } - - @Override - public int getAge() { - return this.age; - } - - @Override - public void incrementAge() { - this.age += 1; - } - - @Override - public Color getViewColor() { - return viewColor; - } -}