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 d5be92dad0dc24dce4712acf164cb434685b41b9..9914af32a6e5be229de52d6bd14e06dca15188ec 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 4831d8405e6d7c985eb4756abd881df012f9d13c..33c4f3f7537502a70b1bafd611c0f7eeeef6f59e 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 fbcd8ce245fca112d0863b17d9e6deb25c63b316..d35bc67c5fa7c2bb16ad3c099b97457b9be8b9d9 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;