diff --git a/src/main/java/model/EntityScenario.java b/src/main/java/model/EntityScenario.java new file mode 100644 index 0000000000000000000000000000000000000000..094862a46b940eeefeacb5d0582d5c5a6d250fc8 --- /dev/null +++ b/src/main/java/model/EntityScenario.java @@ -0,0 +1,14 @@ +package model; + +import util.Matrix; +import util.Position; + +public abstract class EntityScenario implements Scenario{ + public void initScenario(Matrix<Entity> matrix){ + for(int x = 0; x < matrix.getRows(); x++){ + for(int y = 0; y < matrix.getColumns(); y++){ + matrix.set(x,y, new EmptySquare(new Position(x, y))); + } + } + } +} diff --git a/src/main/java/model/FireFighterScenario.java b/src/main/java/model/FireFighterScenario.java index ac4255523df9c60463789f2e5edc1870992776a6..a01a9dd2e87ec26da6cb4d2fdecb6879dfb16b3d 100644 --- a/src/main/java/model/FireFighterScenario.java +++ b/src/main/java/model/FireFighterScenario.java @@ -7,17 +7,13 @@ import util.Matrix; import util.Position; -public class FireFighterScenario implements Board<Entity>{ +public class FireFighterScenario extends EntityScenario implements Board<Entity>{ private Matrix<Entity> matrix; private int step; public FireFighterScenario(int columns, int rows, int initialFireCount, int initialFireFightersCount){ this.matrix = new Matrix<Entity>(columns, rows); - for(int x = 0; x < matrix.getRows(); x++){ - for(int y = 0; y < matrix.getColumns(); y++){ - matrix.set(x,y, new EmptySquare(new Position(x, y))); - } - } + this.step = 0; } public Entity getState(Position position){ diff --git a/src/main/java/model/Scenario.java b/src/main/java/model/Scenario.java new file mode 100644 index 0000000000000000000000000000000000000000..f4dfc48efe42a5c6945132194a404f757996beba --- /dev/null +++ b/src/main/java/model/Scenario.java @@ -0,0 +1,7 @@ +package model; + +import util.Matrix; + +public interface Scenario { + public void initScenario(Matrix<Entity> matrix); +}