From b10e068a288c110b2294ef77dbedd7ec14e0c21e Mon Sep 17 00:00:00 2001 From: Paul Gross Date: Sat, 9 May 2020 16:23:12 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9v=C3=A9lation=20des=20cartes=20personnag?= =?UTF-8?q?e=20fonctionnel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shDBlatest.sql | Bin 648068 -> 648094 bytes src/ihm/controller/JoueurIHM.java | 15 +++++++++------ src/ihm/controller/PlateauController.java | 11 ++++++++++- src/ihm/ressources/PlateauTest2.fxml | 8 ++++---- src/main/Plateau.java | 5 +++-- src/personnage/Bob.java | 4 ++-- src/personnage/Charles.java | 4 ++-- src/personnage/Daniel.java | 4 ++-- src/personnage/Emi.java | 4 ++-- src/personnage/Metamorphe.java | 3 +++ 10 files changed, 37 insertions(+), 21 deletions(-) diff --git a/shDBlatest.sql b/shDBlatest.sql index 27f8612973ab06683744e8f9cb81dd5fd50e46cc..ad47ef693fc15a9e782ab015f92d20416904f81f 100644 GIT binary patch delta 6674 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 TqBA-=`V~%w^quSfwBi2;X6)Kd delta 6648 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 - + - + @@ -611,13 +611,13 @@ - + - + diff --git a/src/main/Plateau.java b/src/main/Plateau.java index 58ce367..b2e7ac0 100644 --- a/src/main/Plateau.java +++ b/src/main/Plateau.java @@ -191,6 +191,7 @@ public class Plateau extends Thread{ public void initCartePersonnage(List cps) throws Exception { + System.out.println(cps); int nbJoueurs = this.joueurs.size(); List lcp = new ArrayList<>(nbJoueurs); @@ -215,6 +216,7 @@ public class Plateau extends Thread{ throw new Exception(); } + System.out.println(lcp); for(int i = 0; i< nbJoueurs; i++) { Joueur j = joueurs.get(i); @@ -229,7 +231,6 @@ public class Plateau extends Thread{ Collections.shuffle(cps); - int nbShadow = nbEquipeShadowHunter; int nbHunter = nbEquipeShadowHunter; int nbNeutre = nbNeutres; @@ -252,6 +253,7 @@ public class Plateau extends Thread{ lcp.add(cp); } } + System.out.println(lcp); return lcp; } @@ -260,7 +262,6 @@ public class Plateau extends Thread{ int nbJoueurs = this.joueurs.size(); int i = 0; - System.out.println(nbJoueurs); while(true) { Joueur currentJoueur = this.joueurs.get(i % nbJoueurs); diff --git a/src/personnage/Bob.java b/src/personnage/Bob.java index 1cf68cb..c8f5bf3 100644 --- a/src/personnage/Bob.java +++ b/src/personnage/Bob.java @@ -18,7 +18,7 @@ public class Bob extends CartePersonnage{ Condition condition = new ConditionStatistiques(ConditionStatistiques.JOUEUR, Joueur.PLAYER_NB_EQUIPEMENTS, 5, ConditionStatistiques.MORE); this.setCondition(condition); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); EffetTarget effet = new EffetTarget(new ActionVoler(ActionVoler.VOLER)); this.setEffet(effet); } @@ -28,7 +28,7 @@ public class Bob extends CartePersonnage{ Condition condition = new ConditionStatistiques(ConditionStatistiques.JOUEUR, Joueur.PLAYER_NB_EQUIPEMENTS, 5, ConditionStatistiques.MORE); this.setCondition(condition); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); EffetTarget effet = new EffetTarget(new ActionVoler(ActionVoler.VOLER)); this.setEffet(effet); } diff --git a/src/personnage/Charles.java b/src/personnage/Charles.java index e12fb6c..df36085 100644 --- a/src/personnage/Charles.java +++ b/src/personnage/Charles.java @@ -11,7 +11,7 @@ public class Charles extends CartePersonnage{ public Charles(Joueur joueur) { super("Charles", "desc", 11, joueur); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); Action action = new ActionAltererStatistiquesJoueur("HP",-2,true); Effet effet = new EffetSelf(action); this.setEffet(effet); @@ -20,7 +20,7 @@ public class Charles extends CartePersonnage{ public Charles() { super("Charles", "desc", 11, null); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); Action action = new ActionAltererStatistiquesJoueur("HP",-2,true); Effet effet = new EffetSelf(action); this.setEffet(effet); diff --git a/src/personnage/Daniel.java b/src/personnage/Daniel.java index 5487c42..53e1565 100644 --- a/src/personnage/Daniel.java +++ b/src/personnage/Daniel.java @@ -33,7 +33,7 @@ public class Daniel extends CartePersonnage{ conditions.add(new ConditionMultiple(conditions2)); Condition winCondition = new ConditionMultipleOR(conditions); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); this.setCondition(winCondition); } @@ -50,7 +50,7 @@ public class Daniel extends CartePersonnage{ conditions.add(new ConditionMultiple(conditions2)); Condition winCondition = new ConditionMultipleOR(conditions); - + this.setEquipe(CartePersonnage.Equipe.NEUTRE); this.setCondition(winCondition); } diff --git a/src/personnage/Emi.java b/src/personnage/Emi.java index e27a19d..4492dc9 100644 --- a/src/personnage/Emi.java +++ b/src/personnage/Emi.java @@ -9,7 +9,7 @@ public class Emi extends CartePersonnage{ public Emi() { super("EMI","desc", HP, null); - + this.setEquipe(CartePersonnage.Equipe.HUNTER); this.setCondition(new WinConditionHunter()); } @@ -22,7 +22,7 @@ public class Emi extends CartePersonnage{ //constructeur public Emi(String nom, String desc ,int hp, Joueur joueur) { super(nom,desc, hp, joueur); - + this.setEquipe(CartePersonnage.Equipe.HUNTER); this.setCondition(new WinConditionHunter()); } diff --git a/src/personnage/Metamorphe.java b/src/personnage/Metamorphe.java index 309eccb..5531c5b 100644 --- a/src/personnage/Metamorphe.java +++ b/src/personnage/Metamorphe.java @@ -13,16 +13,19 @@ public class Metamorphe extends CartePersonnage{ public Metamorphe() { super("METAMORPHE","desc", HP, null); + this.setEquipe(CartePersonnage.Equipe.SHADOW); this.setCondition(new WinConditionShadow()); } public Metamorphe(Joueur j) { super("METAMORPHE","desc", HP, j); + this.setEquipe(CartePersonnage.Equipe.SHADOW); this.setCondition(new WinConditionShadow()); } public Metamorphe(String nom, String desc ,int hp, Joueur joueur) { super(nom,desc, hp, joueur); + this.setEquipe(CartePersonnage.Equipe.SHADOW); this.setCondition(new WinConditionShadow()); }