icones virus et pierre feuille ciseau

src/main/java/model/EmptySquare.java

@@ -17,7 +17,7 @@ public class EmptySquare implements Entity {
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/img.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/img.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/Road.java

@@ -15,7 +15,7 @@ public class Road implements Entity{
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/route.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/route.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/doctorviruspatient/Doctor.java

@@ -10,6 +10,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.Position;
 import util.PositionUtil;
 
@@ -18,6 +19,15 @@ public class Doctor implements Entity {
     private Position position;
     private int age;
     private final Color viewColor = Color.RED;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/virus/docteur.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     
     // Statique car les médecins partagent les connaissances et les recherches
     private static List<Integer> knownVirusVariant = new ArrayList<Integer>();
@@ -152,4 +162,10 @@ public class Doctor implements Entity {
         return Objects.hash(position);
     }
 
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
+
 }

src/main/java/model/doctorviruspatient/DoctorVirusPatientScenario.java

@@ -13,6 +13,8 @@ import model.Scenario;
 import model.Square;
 import util.Position;
 
+
+
 public class DoctorVirusPatientScenario extends Scenario implements Model{
     public DoctorVirusPatientScenario(int columns, int rows, Map<EntityFactory, Integer> initialMap) {
         super(columns, rows, initialMap);
@@ -52,4 +54,7 @@ public class DoctorVirusPatientScenario extends Scenario implements Model{
     }
 
 
+
+
+
 }

src/main/java/model/doctorviruspatient/Patient.java

@@ -9,6 +9,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.PathGenerator;
 import util.Position;
 import util.PositionUtil;
@@ -26,11 +27,36 @@ public class Patient implements Entity {
     private boolean isAsymptomatic;
     private boolean wandering;
 
+
+
+    private static javafx.scene.image.Image healthyImage;
+    private static javafx.scene.image.Image infectedImage;
+
+    static {
+        try {
+            healthyImage = new javafx.scene.image.Image(Patient.class.getResource("/view/icons/virus/humain.png").toExternalForm());
+            infectedImage = new javafx.scene.image.Image(Patient.class.getResource("/view/icons/virus/patient.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
     // Attributs pour le chemin
     private List<Position> path;
     private int pathIndex;
     private static final int MAX_STEPS_IN_DIRECTION = 5;
     private static final int MINIMUM_ROAD_LENGTH = 10;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/virus/humain.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Patient(Position p) {
         this.wandering = true;
@@ -321,4 +347,11 @@ public class Patient implements Entity {
     public int hashCode() {
         return Objects.hash(patientID);
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return isInfected() ? infectedImage : healthyImage;
+    }
+
+
 }

src/main/java/model/doctorviruspatient/Virus.java

@@ -8,6 +8,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.PathGenerator;
 import util.Position;
 import util.PositionUtil;
@@ -23,6 +24,15 @@ public class Virus implements Entity {
     private static final int MINIMUM_ROAD_LENGTH = 10;
     private int health;
     private int variantId;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/virus/virus.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Virus(Position p) {
         this.variantId = 0;
@@ -146,4 +156,11 @@ public class Virus implements Entity {
         health--;
         return false;
     }
+
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/firefighterscenario/AirTanker.java

@@ -22,7 +22,7 @@ public class AirTanker implements Entity{
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/avion.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/avion.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/Cloud.java

@@ -21,7 +21,7 @@ public class Cloud implements Entity{
     
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/nuage.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/nuage.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/Fire.java

@@ -23,7 +23,7 @@ public class Fire implements Entity {
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/flamme.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/flamme.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/FireFighter.java

@@ -23,7 +23,7 @@ public class FireFighter implements Entity {
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/sapeur-pompier.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/sapeur-pompier.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/MotorizedFireFighter.java

@@ -16,7 +16,7 @@ public class MotorizedFireFighter extends FireFighter {
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/camion.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/camion.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/Mountain.java

@@ -17,7 +17,7 @@ public class Mountain implements Entity{
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/montagne.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/montagne.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/firefighterscenario/Rockery.java

@@ -19,7 +19,7 @@ public class Rockery implements Entity{
 
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/rochers.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/fire/rochers.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/model/rockpapercisor/Cisor.java

@@ -8,6 +8,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.Position;
 import util.PositionUtil;
 
@@ -16,6 +17,15 @@ public class Cisor implements Entity {
     Position position;
     private int age;
     private final Color viewColor = Color.RED;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/pfc/cis.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Cisor(Position p) {
         this.position = p;
@@ -121,4 +131,10 @@ public class Cisor implements Entity {
     public int hashCode() {
         return Objects.hash(position, age);
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/rockpapercisor/Paper.java

@@ -7,6 +7,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.Position;
 import util.PositionUtil;
 
@@ -15,6 +16,15 @@ public class Paper implements Entity {
     Position position;
     private int age;
     private final Color viewColor = Color.GRAY;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/pfc/paper.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Paper(Position p) {
         this.position = p;
@@ -103,4 +113,10 @@ public class Paper implements Entity {
     public int getPriority() {
         return this.priority;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/rockpapercisor/Rock.java

@@ -7,6 +7,7 @@ import javafx.scene.paint.Color;
 import model.Board;
 import model.Entity;
 import model.Square;
+import model.firefighterscenario.Cloud;
 import util.Position;
 import util.PositionUtil;
 
@@ -15,6 +16,15 @@ public class Rock implements Entity {
     Position position;
     private int age;
     private final Color viewColor = Color.CHOCOLATE;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/pfc/rock.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Rock(Position p) {
         this.position = p;
@@ -104,4 +114,10 @@ public class Rock implements Entity {
     public int getPriority() {
         return this.priority;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/rockpapercisor/RockPaperCisorScenario.java

@@ -48,4 +48,8 @@ public class RockPaperCisorScenario extends Scenario implements Model{
     public Board<Square> getBoard() {
         return this;
     }
+
+
+
+
 }