Skip to content
Snippets Groups Projects
Commit ce48df78 authored by HANI Walakiyim's avatar HANI Walakiyim
Browse files

je pense m'arreter ici

parent 77634ce1
No related branches found
No related tags found
No related merge requests found
Pipeline #25702 passed
......@@ -22,6 +22,7 @@ public class SimulatorApplication extends javafx.application.Application {
public static final int INITIAL_CLOUD_COUNT = 15;
public static final int INITIAL_MOTORIZEDFIREFIGHTER_COUNT = 2;
public static final int INITIAL_MOUNTAIN_COUNT = 15;
public static final int INITIAL_ROAD_COUNT =5;
private Stage primaryStage;
private Parent view;
......@@ -47,7 +48,7 @@ public class SimulatorApplication extends javafx.application.Application {
view = loader.load();
Controller controller = loader.getController();
controller.initialize(SQUARE_WIDTH, SQUARE_HEIGHT, COLUMN_COUNT, ROW_COUNT,
INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT, INITIAL_CLOUD_COUNT,INITIAL_MOTORIZEDFIREFIGHTER_COUNT,INITIAL_MOUNTAIN_COUNT);
INITIAL_FIRE_COUNT, INITIAL_FIREFIGHTER_COUNT, INITIAL_CLOUD_COUNT,INITIAL_MOTORIZEDFIREFIGHTER_COUNT,INITIAL_MOUNTAIN_COUNT, INITIAL_ROAD_COUNT);
}
private void showScene() {
......
......@@ -112,9 +112,9 @@ public class Controller {
}
public void initialize(int squareWidth, int squareHeight, int columnCount,
int rowCount, int initialFireCount, int initialFirefighterCount,int initialCloudCount,int initialMotorizedFireFighterCount,int initialMountainCount) {
int rowCount, int initialFireCount, int initialFirefighterCount,int initialCloudCount,int initialMotorizedFireFighterCount,int initialMountainCount, int initialRoadCount) {
grid.setDimensions(columnCount, rowCount, squareWidth, squareHeight);
board = new GameBoard(rowCount,columnCount,initialFireCount,initialFirefighterCount,initialCloudCount,initialMotorizedFireFighterCount,initialMountainCount);
board = new GameBoard(rowCount,columnCount,initialFireCount,initialFirefighterCount,initialCloudCount,initialMotorizedFireFighterCount ,initialMountainCount /*,initialRoadCount*/);
board.initializeElements();
repaintGrid();
}
......
......@@ -6,6 +6,7 @@ import model.ExtinguishFire.FireFighter;
import model.ExtinguishFire.MotorizedFireFighter;
import model.Flammable.Fire;
import model.Obstacle.Mountain;
import model.Obstacle.Road;
public class GameManage {
private final int fires;
......@@ -47,6 +48,12 @@ public class GameManage {
/*for(int i=0;i<rocailles;i++) {
new Rocailles(Color.GREY);
}*/
for (int i = 0; i < roads; i++) {
new Road(Color.DIMGREY);
}
for (int i = 0; i < mountains; i++) {
new Mountain(Color.GREY);
}
......
package model.Obstacle;
public class Road {
import javafx.scene.paint.Color;
import model.BoardElement;
import model.GameBoard;
import model.Visitor.Visitor;
import util.Position;
import java.util.ArrayList;
import java.util.HashMap;
import static model.GameBoard.elementPosition;
/*public class Road {
}*/
public class Road implements Obstacles{
private final Color color;
public Road(Color color){
this.color=color;
initialize();
}
@Override
public Color getColor() {
return color;
}
@Override
public Boolean accept(Visitor visitor) {
return visitor.visit(this);
}
@Override
public void initialize() {
Position position = GameBoard.randomPosition();
if (elementPosition.containsKey(position))
elementPosition.get(position).add(this);
else {
ArrayList<BoardElement> boardElements = new ArrayList<>();
boardElements.add(this);
elementPosition.put(position, boardElements);
}
}
@Override
public void update(GameBoard gameBoard, Position position, HashMap<Position, ArrayList<BoardElement>> newElementPosition, ArrayList<Position> extinguishPosition) {
if(newElementPosition.containsKey(position))
newElementPosition.get(position).add(this);
else{
ArrayList<BoardElement> boardElements = new ArrayList<>();
boardElements.add(this);
newElementPosition.put(position,boardElements);
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment