diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index f6264f83d26b9805dd698461c9d850c5885e0876..8966942aee03de73e68a87ab5eda41875b89188a 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.bin and b/.gradle/8.10.2/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index ea447a5c4ad764b00e95092aa5b3df0a48803d12..49405863aae00b494edce1612be226fca494db64 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.lock and b/.gradle/8.10.2/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 885ac781984bacc0a039b609b3999b6becef5489..84af1bac982e9312a52aa9ba9aa23d5509ab9a63 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.bin and b/.gradle/8.10.2/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 4e33d30c25f2393247a13632145ba2582b44b3f9..9b9ae10214f053332d90fa497259bd818b9c02b4 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.lock and b/.gradle/8.10.2/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 887d9133bceb30ddce1ed7881efde9664b04bd65..b8725ad6b473dbb8ff8d32e72245358ae0f97214 100644
Binary files a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9ea26fd05e8268051b9ef9db3e21df482cf83307..f99829631ca3c57b3cb959e50f14c3f164809d83 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index ef0277adcabaa569125da33fe27b05b0df4d0427..fe995f24c681881710a124d2c448c80c3587f7c7 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/build/classes/java/main/model/ElementManager.class b/build/classes/java/main/model/ElementManager.class
deleted file mode 100644
index abc64510c990809c4aad859777a4a59aca4086cf..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/ElementManager.class and /dev/null differ
diff --git a/build/classes/java/main/model/FFBoard.class b/build/classes/java/main/model/FFBoard.class
index 88e8dad177692b2b612535247661c3c9569e5824..9ed68b6c6974ad6e3ccdba8b5b162feb0dedbf50 100644
Binary files a/build/classes/java/main/model/FFBoard.class and b/build/classes/java/main/model/FFBoard.class differ
diff --git a/build/classes/java/main/model/FFBoardData.class b/build/classes/java/main/model/FFBoardData.class
index 4483f542bcd15ccbb57cf01f6a013a227d435dcd..083bf54eef3faaf8e51274d1d229a5ee5f7d084d 100644
Binary files a/build/classes/java/main/model/FFBoardData.class and b/build/classes/java/main/model/FFBoardData.class differ
diff --git a/build/classes/java/main/model/FireBehavior.class b/build/classes/java/main/model/FireBehavior.class
index 319534dc2c14b6a6c143d71d7a0211911b945a3b..a63c2a3b6535781cf1e152bbb4645a4accf42d73 100644
Binary files a/build/classes/java/main/model/FireBehavior.class and b/build/classes/java/main/model/FireBehavior.class differ
diff --git a/build/classes/java/main/model/FireFactory.class b/build/classes/java/main/model/FireFactory.class
index 815e81bb9b9ce8b3b04724e69b9468342e16ba1c..6e4183b0a1a91d569b73a44dee37ec01ec8e7e3a 100644
Binary files a/build/classes/java/main/model/FireFactory.class and b/build/classes/java/main/model/FireFactory.class differ
diff --git a/build/classes/java/main/model/FirefighterBehavior.class b/build/classes/java/main/model/FirefighterBehavior.class
index 704bf8be9a867e3fc60307903f234a7a3fffa56d..2bca188bdc18f223c28a8b7a8294d8cb2036cb8f 100644
Binary files a/build/classes/java/main/model/FirefighterBehavior.class and b/build/classes/java/main/model/FirefighterBehavior.class differ
diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index a306f9d979932c1032706a9334129652b0f3ed08..d3db593cc6c61187e3068ed32b7fe61f64ac09e4 100644
Binary files a/build/classes/java/main/model/ModelElement.class and b/build/classes/java/main/model/ModelElement.class differ
diff --git a/build/classes/java/main/model/Rock.class b/build/classes/java/main/model/Rock.class
index f23f7b6899e00054ebbb59d74749921fd2fc11fa..41ee410a25e815c5d9cb896015db1ce726e96037 100644
Binary files a/build/classes/java/main/model/Rock.class and b/build/classes/java/main/model/Rock.class differ
diff --git a/build/classes/java/main/model/SlowFire.class b/build/classes/java/main/model/SlowFire.class
deleted file mode 100644
index c463e9921eec27a20924cec99609498cd217f76f..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/SlowFire.class and /dev/null differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index 1e3f14e9413c7d72ffe3178a764deb88ed309051..05ff7c3e9ec43e2613194430a978bf1e0c053711 100644
Binary files a/build/classes/java/main/view/ViewElement.class and b/build/classes/java/main/view/ViewElement.class differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CloudBehavior.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/CloudBehavior.class.uniqueId1
deleted file mode 100644
index b82fcd18821403a9d9289b8aa19200fd231f8b71..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CloudBehavior.class.uniqueId1 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId7
deleted file mode 100644
index 360986a08a7cb0be7450bcd306c3e8e7a6573fd0..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Fire.class.uniqueId7 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FireFighterBehavior.class.uniqueId8 b/build/tmp/compileJava/compileTransaction/stash-dir/FireFighterBehavior.class.uniqueId8
deleted file mode 100644
index 704bf8be9a867e3fc60307903f234a7a3fffa56d..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/FireFighterBehavior.class.uniqueId8 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/SlowFire.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/SlowFire.class.uniqueId0
deleted file mode 100644
index c463e9921eec27a20924cec99609498cd217f76f..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/SlowFire.class.uniqueId0 and /dev/null differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/StandardFire.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/StandardFire.class.uniqueId6
deleted file mode 100644
index 81358e7c16260b8d1d77d2d7a0650163f6d5df8f..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/StandardFire.class.uniqueId6 and /dev/null differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 72404e03bcab8bf54fc8e2fe55f9219b328d7448..bd6cd71f525a43641a292bca9740f473d8975ebd 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/model/ChargeTarget.java b/src/main/java/model/ChargeTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..3fbab15bce0218b31ce61515fd590ad3389dadec
--- /dev/null
+++ b/src/main/java/model/ChargeTarget.java
@@ -0,0 +1,8 @@
+package model;
+
+public interface ChargeTarget {
+ public int getCounter();
+ public void incrementCounter();
+ public void resetCounter();
+ public boolean isCharged();
+}
diff --git a/src/main/java/model/ChargerBehavior.java b/src/main/java/model/ChargerBehavior.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa26a9bd9dd69e5b264aa089717385360504a085
--- /dev/null
+++ b/src/main/java/model/ChargerBehavior.java
@@ -0,0 +1,10 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+
+public interface ChargerBehavior<E> extends Behavior {
+ public List<E> getChargeTarget();
+ public Boolean isCharged(ChargeTarget chargeTarget);
+}
diff --git a/src/main/java/model/CloudBehavior.java b/src/main/java/model/CloudBehavior.java
index d95bff7b30dfcf0ad5b928837dc27601ab2fdb46..0c8eeabb04a4b1cb4c5f455b4406d6deacc86935 100644
--- a/src/main/java/model/CloudBehavior.java
+++ b/src/main/java/model/CloudBehavior.java
@@ -9,7 +9,6 @@ import util.Position;
import java.util.*;
public class CloudBehavior extends FFBehavior implements RemoverBehavior<ModelElement> {
- private final ModelElement removedElement=ModelElement.CLOUD;
private final Random random=new Random();
@Override
diff --git a/src/main/java/model/ElementManager.java b/src/main/java/model/ElementManager.java
deleted file mode 100644
index f7f06d8e6968605acca1be1f928afacb3d1ba73f..0000000000000000000000000000000000000000
--- a/src/main/java/model/ElementManager.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package model;
-
-import util.Position;
-
-import java.util.List;
-
-public abstract class ElementManager {
- ModelElement type;
- List<ModelElement> obstacles;
- public ElementManager(ModelElement type) {
- this.type = type;
- }
- public abstract List<Position> Update(BoardData board, List<Position> modifiedList);
-}
diff --git a/src/main/java/model/FFBoard.java b/src/main/java/model/FFBoard.java
index 6134a3dac511a0578ae1d283cbc694b45eaac9bb..f334cbcdb6041acb667ed3d70d01d3a5fb771a8b 100644
--- a/src/main/java/model/FFBoard.java
+++ b/src/main/java/model/FFBoard.java
@@ -33,11 +33,13 @@ public class FFBoard implements Board<List<ModelElement>> {
filler.fillBoard(boardData,new int[]{
5,//firefighter
2,//motorized firefighter
- 3,//clouds
- 10,//mountains
- 5,//roads
- 10,//rocks
- 10});//fires
+ 2,//clouds
+ 30,//mountains
+ 10,//roads
+ 20,//forests
+ 10,//fires
+ 10//rocks
+ });
}
private Position randomPosition() {
diff --git a/src/main/java/model/FFBoardData.java b/src/main/java/model/FFBoardData.java
index 37a3fbf12d7d0d26b641effb109758e9e3f1e3ed..fe999bf185001a2a0685820ad79666127fd8ba11 100644
--- a/src/main/java/model/FFBoardData.java
+++ b/src/main/java/model/FFBoardData.java
@@ -82,7 +82,6 @@ public class FFBoardData implements BoardData{
if (element.getBehavior() instanceof TangibleBehavior<?>)
if (!((TangibleBehavior)element.getBehavior()).isLegal(this,element.getPosition()))
return false;
- System.out.println(element.getType());
elementList.get(element.getType().ordinal()).add(element);
getCell(element.getPosition()).Content.add(element);
FFUpdater.modifiedPositions.add(element.getPosition());
diff --git a/src/main/java/model/FireBehavior.java b/src/main/java/model/FireBehavior.java
index c75a0d372cfe4e1ccf4b514ee23392c47a3cd33f..adb1378d356075e8bca3d3385aab64ca8edca861 100644
--- a/src/main/java/model/FireBehavior.java
+++ b/src/main/java/model/FireBehavior.java
@@ -7,8 +7,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelElement> {
+public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,ChargerBehavior<ModelElement> {
private List<ModelElement> obstacles=List.of(ModelElement.MOUNTAIN,ModelElement.ROAD);
+ private List<ModelElement> chargeTargets=List.of(ModelElement.ROCK);
@Override
public List<Position> update(BoardData boardData,Element element) {
@@ -22,7 +23,7 @@ public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelE
public List<Position> legalNeighbors(BoardData boardData,Position position) {
List<Position> neighbors=new ArrayList<>(boardData.getNeighbor(position));
for (Position p:boardData.getNeighbor(position)) {
- if (!isLegal(boardData,p)) neighbors.remove(p);
+ if (!isLegal(boardData,p) || !isCharger(boardData,p)) neighbors.remove(p);
}
return neighbors;
}
@@ -40,10 +41,18 @@ public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelE
public List<ModelElement> getObstacles() {
return obstacles;
}
-
+ private Boolean isCharger(BoardData boardData,Position position) {
+ for (Element e:boardData.getCell(position).Content) {
+ for (ModelElement c:getChargeTarget())
+ if(e.getType()==c){
+ ((ChargeTarget)e).incrementCounter();
+ return false;
+ }
+ }
+ return true;
+ }
@Override
public Boolean isLegal(BoardData boardData,Position position) {
- System.out.println("is legal");
for (Element e:boardData.getCell(position).Content) {
if (e instanceof Fire) return false;
for(ModelElement o:getObstacles())
@@ -51,4 +60,14 @@ public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelE
}
return true;
}
+
+ @Override
+ public List<ModelElement> getChargeTarget() {
+ return chargeTargets;
+ }
+
+ @Override
+ public Boolean isCharged(ChargeTarget chargeTarget) {
+ return chargeTarget.isCharged();
+ }
}
diff --git a/src/main/java/model/FireFactory.java b/src/main/java/model/FireFactory.java
index cb54c47dfd98d7cf62978866bfb51da82f68531c..374a6e5694733138cfb4faa374e11cea4ae3e162 100644
--- a/src/main/java/model/FireFactory.java
+++ b/src/main/java/model/FireFactory.java
@@ -9,11 +9,10 @@ import java.util.Map;
public class FireFactory implements ElementFactory{
static Map<ModelElement,ModelElement> fireDictionary=new HashMap<>();
static{
- fireDictionary.put(ModelElement.ROCK,ModelElement.SLOWFIRE);
+ fireDictionary.put(ModelElement.FOREST,ModelElement.SLOWFIRE);
}
public ModelElement getNewType(BoardData boardData, Position position){
List<ModelElement> s = boardData.getCell(position).Content.stream().map(x -> x.getType()).toList();
- System.out.println("getnewtype");
for(Map.Entry<ModelElement,ModelElement> entry: fireDictionary.entrySet()){
if (s.contains(entry.getKey())) return entry.getValue();
}
@@ -21,10 +20,9 @@ public class FireFactory implements ElementFactory{
}
public Element getNewElement(BoardData boardData, Position position){
List<ModelElement> s = boardData.getCell(position).Content.stream().map(x -> x.getType()).toList();
- System.out.println("getnewtype");
for(Map.Entry<ModelElement,ModelElement> entry: fireDictionary.entrySet()){
if (s.contains(entry.getKey())) return entry.getValue().instanciate(position);
}
- return new StandardFireFighter(position);
+ return new StandardFire(position);
}
}
diff --git a/src/main/java/model/FireFighterBehavior.java b/src/main/java/model/FireFighterBehavior.java
index f1cb00d20460593fd8cf37ebf55ac4dd64a99649..31d9a12deec47c5283532946a7ec95cb75818388 100644
--- a/src/main/java/model/FireFighterBehavior.java
+++ b/src/main/java/model/FireFighterBehavior.java
@@ -4,15 +4,15 @@ import util.Position;
import util.TargetStrategy;
import java.util.*;
-public class FireFighterBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,RemoverBehavior<ModelElement> {
+public class FireFighterBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,RemoverBehavior<ModelElement>,ChargerBehavior<ModelElement> {
private List<ModelElement> obstacles=List.of(ModelElement.MOUNTAIN);
private TargetStrategy ts=new TargetStrategy();
+ private List chargeTarget=List.of(ModelElement.ROCK);
List<Position> initializeTargets(BoardData boardData){
List<Position> targets=new ArrayList<>();
for (ModelElement me:ModelElement.values()) {
if (me.isInstanceOf(Fire.class)){
- System.out.println("0");
for (Element e:boardData.getElements().get(me.ordinal())) {
targets.add(e.getPosition());
}}
@@ -54,6 +54,8 @@ public class FireFighterBehavior extends FFBehavior implements TangibleBehavior<
for (Element e:c) {
if (e instanceof Fire){
boardData.removeElement(e);}
+ if (chargeTarget.contains(e.getType()))
+ ((ChargeTarget)e).resetCounter();
}
}
}
@@ -73,4 +75,14 @@ public class FireFighterBehavior extends FFBehavior implements TangibleBehavior<
}
return neighbors;
}
+
+ @Override
+ public List getChargeTarget() {
+ return chargeTarget;
+ }
+
+ @Override
+ public Boolean isCharged(ChargeTarget chargeTarget) {
+ return chargeTarget.isCharged();
+ }
}
diff --git a/src/main/java/model/Forest.java b/src/main/java/model/Forest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2361826daf863bb1795b2310e53c6c5c418b43e
--- /dev/null
+++ b/src/main/java/model/Forest.java
@@ -0,0 +1,11 @@
+package model;
+
+import util.Position;
+
+public class Forest extends Land implements Element {
+ //explanation : while reading the subject, I thought that any FIRE that was ON a ROCK took 4 turns instead of 2 (i changed slowfire into quickfire (1 turn) and did the forest);
+ public Forest(Position position) {
+ super(position);
+ type=ModelElement.FOREST;
+ }
+}
diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java
index fc2275576036f402903c258d509d6f9cfcd7a465..f9c7bcf9bd1f1d6e9b59ba9bffe8784d7b89bc77 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/ModelElement.java
@@ -4,25 +4,24 @@ import util.Position;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
-import java.util.List;
public enum ModelElement {
-
+ FIRE(StandardFire.class),
+ SLOWFIRE(QuickFire.class),
FIREFIGHTER(StandardFireFighter.class),
MOTORIZEDFIREFIGHTER(MotorizedFireFighter.class),
- FIRE(StandardFire.class),
- SLOWFIRE(SlowFire.class),
+
CLOUD(Cloud.class),
MOUNTAIN(Mountain.class),
ROAD(Road.class),
+ FOREST(Forest.class),
ROCK(Rock.class);
public final Class<?> c;
ModelElement(Class<?>c) {
this.c =c;
- System.out.println(c);
}
public boolean isUpdatable(){
Class<?> currentClass=c;
diff --git a/src/main/java/model/QuickFire.java b/src/main/java/model/QuickFire.java
new file mode 100644
index 0000000000000000000000000000000000000000..d70ec9f3f465ac157a1cdb4ab74a34e6ad7d42ae
--- /dev/null
+++ b/src/main/java/model/QuickFire.java
@@ -0,0 +1,9 @@
+package model;
+
+import util.Position;
+
+public class QuickFire extends Fire implements Updatable{
+ public QuickFire(Position position) {
+ super(1, ModelElement.SLOWFIRE, position);
+ }
+}
diff --git a/src/main/java/model/Rock.java b/src/main/java/model/Rock.java
index 8c8f4fdeb56c51a3553b54647743c6c3b66df629..9e1e80f5aa836ebd185a9b11566e064a5debff1a 100644
--- a/src/main/java/model/Rock.java
+++ b/src/main/java/model/Rock.java
@@ -2,9 +2,57 @@ package model;
import util.Position;
-public class Rock extends Land implements Element {
+import java.util.List;
+
+public class Rock implements Element,ChargeTarget,Updatable,Printable {
+ Position position;
+ ModelElement type=ModelElement.ROCK;
+ static Behavior behavior=new RockBehavior();
+ int counter;
+ final int max=4;
public Rock(Position position) {
- super(position);
- type=ModelElement.ROCK;
+ this.position=position;
+ counter=0;
+ }
+
+ @Override
+ public int getCounter() {
+ return counter;
+ }
+
+ @Override
+ public void incrementCounter() {
+ if (counter!=max) counter++;
+ }
+
+ @Override
+ public void resetCounter() {
+ counter=0;
+ }
+
+ @Override
+ public boolean isCharged() {
+ return (counter==max);
+ }
+
+ @Override
+ public Position getPosition() {
+ return position;
+ }
+
+ @Override
+ public ModelElement getType() {
+ return type;
+ }
+
+ @Override
+ public Behavior getBehavior() {
+ return behavior;
+ }
+
+ @Override
+ public List<Position> updateSelf(BoardData boardData) {
+ getBehavior().update(boardData,this);
+ return null;
}
}
diff --git a/src/main/java/model/RockBehavior.java b/src/main/java/model/RockBehavior.java
new file mode 100644
index 0000000000000000000000000000000000000000..bee781329dcb6e425cea70abaa34a5a2ba7562d0
--- /dev/null
+++ b/src/main/java/model/RockBehavior.java
@@ -0,0 +1,29 @@
+package model;
+
+import util.Position;
+
+import java.util.List;
+import java.util.Map;
+
+public class RockBehavior implements Behavior{
+
+ @Override
+ public List<Position> update(BoardData boardData, Element element) {
+ ChargeTarget chargeTarget= (ChargeTarget) element;
+ if (chargeTarget.isCharged()){
+ chargeTarget.resetCounter();
+ boardData.addElement(Fire.factory.getNewElement(boardData,element.getPosition()));
+ }
+ return null;
+ }
+
+ @Override
+ public List<Position> legalNeighbors(BoardData boardData, Position position) {
+ return null;
+ }
+
+ @Override
+ public Map<Position, List<Position>> allLegalNeighbors(BoardData boardData) {
+ return null;
+ }
+}
diff --git a/src/main/java/model/SlowFire.java b/src/main/java/model/SlowFire.java
deleted file mode 100644
index 2160b2c26ec5fa219e32c6a65cf9d32b8bef8a57..0000000000000000000000000000000000000000
--- a/src/main/java/model/SlowFire.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package model;
-
-import util.Position;
-
-public class SlowFire extends Fire implements Updatable{
- public SlowFire(Position position) {
- super(4, ModelElement.SLOWFIRE, position);
- }
-}
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index b5c4762b1fccda9b52b6eff6390d6cbb1df7f5fe..6d0b17a5a32766633bb40868ed6e3949e57872d7 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -5,17 +5,18 @@ import model.*;
import util.Position;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
public enum ViewElement {
+
FIREFIGHTER(Color.BLUE, StandardFireFighter.class),
MOTORIZEDFIREFIGHTER(Color.DARKBLUE, MotorizedFireFighter.class),
- CLOUD(Color.GRAY, Cloud.class) ,
+ CLOUD(Color.GRAY, Cloud.class),
MOUNTAIN(Color.BROWN, Mountain.class),
ROAD(Color.BLACK, Road.class),
- ROCK(Color.LIGHTYELLOW, Rock.class),
+ FOREST(Color.GREEN, Forest.class),
FIRE(Color.RED,Fire.class,Fire.factory),
+ ROCK(Color.DARKGOLDENROD, Rock.class),
+
EMPTY(Color.WHITE, null);
final Color color;
public final Class<?> c;
@@ -32,7 +33,6 @@ public enum ViewElement {
}
public Element instanciate(BoardData boardData,Position position){
Element element;
- Class<?>[] arg2=new Class[]{BoardData.class,Position.class};
Class<?>[] arg1=new Class[]{Position.class};
if (elementFactory!=null) {
element=elementFactory.getNewElement(boardData,position);