diff --git a/src/modele/calculs/IA.java b/src/modele/calculs/IA.java index 7963c53..141db51 100644 --- a/src/modele/calculs/IA.java +++ b/src/modele/calculs/IA.java @@ -4,44 +4,24 @@ import modele.donnees.ElementDynamique; import modele.donnees.ElementFond; import modele.donnees.Entite; import modele.donnees.Heros; + +import java.awt.*; import java.util.Random; public class IA extends RealisateurDeDeplacement { - // private Direction directionCourante; - private static IA dep; + int genererInt(int borneInf, int borneSup){ Random rand = new Random(); int nb; nb = borneInf+rand.nextInt(borneSup-borneInf); return nb; } - public static IA getInstance() { - if (dep == null) { - dep = new IA(); - } - return dep; - } + protected boolean realiserDeplacement() { for (ElementDynamique e : lstEntitesDynamiques) if (e instanceof modele.donnees.IA) { - modele.donnees.IA ia = (modele.donnees.IA) e; - // Direction d = Direction.droite; - //System.out.println(genererInt(1, 1000)); - - if (genererInt(1, 1000) > 500) { - Direction deplacement = Direction.gauche; - if (!ia.avancerDirectionChoisie(deplacement)) { - deplacement = Direction.droite; - ia.avancerDirectionChoisie(deplacement); - - } - } else { - Direction deplacement = Direction.droite; - if (!ia.avancerDirectionChoisie(deplacement)) { - deplacement = Direction.gauche; - ia.avancerDirectionChoisie(deplacement); - } - } + e.avancerDirectionChoisie(null); } + return false; } diff --git a/src/modele/donnees/IA.java b/src/modele/donnees/IA.java index 7b3388f..5155f0f 100644 --- a/src/modele/donnees/IA.java +++ b/src/modele/donnees/IA.java @@ -5,6 +5,7 @@ */ package modele.donnees; +import modele.calculs.Direction; import modele.calculs.Jeu; import java.util.Random; @@ -19,6 +20,11 @@ public class IA extends Entite { super(jeu); } + @Override + public boolean avancerDirectionChoisie(Direction d) { + return super.avancerDirectionChoisie(jeu.getDirection(this, jeu.getHector())); + } + @Override public boolean peutEtreEcrase() { return true;