diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java index 4a741ab0944e82950b1b6225170c76a723b9f03b..c8f74ff90370e907aae287daf2f455308e3470c5 100644 --- a/src/main/java/model/Cloud.java +++ b/src/main/java/model/Cloud.java @@ -13,6 +13,7 @@ public class Cloud implements Entity{ private int age; private Position position; private final Color viewColor = Color.GREEN; + private final int priority = 3; @@ -94,4 +95,8 @@ public class Cloud implements Entity{ public Color getViewColor() { return this.viewColor; } + + @Override + public int getPriority(){ return this.priority;} + } diff --git a/src/main/java/model/Entity.java b/src/main/java/model/Entity.java index 7cafb0e4c7c5af55e65f10603af93062a02d7257..888ea61bd9f2c4a68b0bbfd86d9e6448701046f4 100644 --- a/src/main/java/model/Entity.java +++ b/src/main/java/model/Entity.java @@ -24,4 +24,5 @@ public interface Entity { public void setAge(int age); public void incrementAge(); public Color getViewColor(); + public int getPriority(); } diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java index 16b8726528e434c9678b566720b5443304eed439..7028c9c64fa20e7ef3a41a2b956620c5043e884a 100644 --- a/src/main/java/model/Fire.java +++ b/src/main/java/model/Fire.java @@ -13,6 +13,7 @@ public class Fire implements Entity { private Position position; private final Color viewColor = Color.RED; private int age; + private final int priority = 0; public Fire(Position position, Board<Square> b) { this.b = b; @@ -73,4 +74,7 @@ public class Fire implements Entity { public void setAge(int age) { this.age = age; } + + @Override + public int getPriority(){ return this.priority;} } diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java index cf7a6c52fd4a8bece2d2595a6af23b7c1ad6bb40..8ce37e29a122aae1016ef23e921f16a6047ba9b8 100644 --- a/src/main/java/model/FireFighter.java +++ b/src/main/java/model/FireFighter.java @@ -12,6 +12,7 @@ public class FireFighter implements Entity { private int age; private Position position; private final Color viewColor = Color.BLUE; + private final int priority = 1; public FireFighter(Position position, Board<Square> b) { this.position = position; @@ -138,4 +139,6 @@ public class FireFighter implements Entity { public void setAge(int age) { this.age = age; } + public int getPriority(){ return this.priority;} + }