From 73fcc385acbd88117af42f4b6ca38bbeb04f0877 Mon Sep 17 00:00:00 2001
From: rosier8u <basile.rosier6@etu.univ-lorraine>
Date: Tue, 28 Nov 2023 08:44:17 +0100
Subject: [PATCH] maj de DPStrategie
---
.../{ => DPStrategie}/ConcreteStrategieAgressif.java | 8 +++++---
.../{ => DPStrategie}/ConcreteStrategieDefensif.java | 8 +++++---
.../src/tests/ConcreteStrategieAgressifTest.java | 1 +
3 files changed, 11 insertions(+), 6 deletions(-)
rename design_pattern/src/modele/{ => DPStrategie}/ConcreteStrategieAgressif.java (50%)
rename design_pattern/src/modele/{ => DPStrategie}/ConcreteStrategieDefensif.java (72%)
diff --git a/design_pattern/src/modele/ConcreteStrategieAgressif.java b/design_pattern/src/modele/DPStrategie/ConcreteStrategieAgressif.java
similarity index 50%
rename from design_pattern/src/modele/ConcreteStrategieAgressif.java
rename to design_pattern/src/modele/DPStrategie/ConcreteStrategieAgressif.java
index d5be92d..9914af3 100644
--- a/design_pattern/src/modele/ConcreteStrategieAgressif.java
+++ b/design_pattern/src/modele/DPStrategie/ConcreteStrategieAgressif.java
@@ -1,6 +1,8 @@
-package modele;
+package modele.DPStrategie;
-public class ConcreteStrategieAgressif implements Strategie{
+import modele.Personnage;
+
+public class ConcreteStrategieAgressif implements Strategie {
@Override
public void attaquer(int degat, Personnage personnage) {
personnage.subir(degat+5);
@@ -8,6 +10,6 @@ public class ConcreteStrategieAgressif implements Strategie{
@Override
public void subir(int degat, Personnage personnage) {
- personnage.setPointsDeVie(personnage.pointsDeVie - (degat+5));
+ personnage.setPointsDeVie(personnage.getPointsDeVie() - (degat+5));
}
}
diff --git a/design_pattern/src/modele/ConcreteStrategieDefensif.java b/design_pattern/src/modele/DPStrategie/ConcreteStrategieDefensif.java
similarity index 72%
rename from design_pattern/src/modele/ConcreteStrategieDefensif.java
rename to design_pattern/src/modele/DPStrategie/ConcreteStrategieDefensif.java
index 4831d84..33c4f3f 100644
--- a/design_pattern/src/modele/ConcreteStrategieDefensif.java
+++ b/design_pattern/src/modele/DPStrategie/ConcreteStrategieDefensif.java
@@ -1,6 +1,8 @@
-package modele;
+package modele.DPStrategie;
-public class ConcreteStrategieDefensif implements Strategie{
+import modele.Personnage;
+
+public class ConcreteStrategieDefensif implements Strategie {
@Override
public void attaquer(int degat, Personnage personnage) {
// Pour ne pas avoir de dégats négatif
@@ -18,6 +20,6 @@ public class ConcreteStrategieDefensif implements Strategie{
if((degat-5)>0){
nouveauDegat = degat-5;
}
- personnage.setPointsDeVie(personnage.pointsDeVie - (degat-5));
+ personnage.setPointsDeVie(personnage.getPointsDeVie() - (degat-5));
}
}
diff --git a/design_pattern/src/tests/ConcreteStrategieAgressifTest.java b/design_pattern/src/tests/ConcreteStrategieAgressifTest.java
index fbcd8ce..d35bc67 100644
--- a/design_pattern/src/tests/ConcreteStrategieAgressifTest.java
+++ b/design_pattern/src/tests/ConcreteStrategieAgressifTest.java
@@ -1,6 +1,7 @@
package tests;
import modele.*;
+import modele.DPStrategie.ConcreteStrategieAgressif;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
--
GitLab