From 7257ba9690e4f985bc272eca67ff9ad4e5025714 Mon Sep 17 00:00:00 2001
From: melizzzz <152108637+melizzzz@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:16:53 +0100
Subject: [PATCH] =?UTF-8?q?ajout=20de=20la=20fonction=20getPriority()=20da?=
=?UTF-8?q?ns=20Entity=20pour=20g=C3=A9rer=20l'affichage=20des=20entit?=
=?UTF-8?q?=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/model/Cloud.java | 5 +++++
src/main/java/model/Entity.java | 1 +
src/main/java/model/Fire.java | 4 ++++
src/main/java/model/FireFighter.java | 3 +++
4 files changed, 13 insertions(+)
diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java
index 4a741ab..c8f74ff 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 7cafb0e..888ea61 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 16b8726..7028c9c 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 cf7a6c5..8ce37e2 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;}
+
}
--
GitLab