diff --git a/src/modele/deplacements/Colonne.java b/src/modele/calculs/Colonne.java similarity index 100% rename from src/modele/deplacements/Colonne.java rename to src/modele/calculs/Colonne.java diff --git a/src/modele/deplacements/Controle4Directions.java b/src/modele/calculs/Controle4Directions.java similarity index 96% rename from src/modele/deplacements/Controle4Directions.java rename to src/modele/calculs/Controle4Directions.java index 71cedda..984fe59 100644 --- a/src/modele/deplacements/Controle4Directions.java +++ b/src/modele/calculs/Controle4Directions.java @@ -1,7 +1,7 @@ package modele.deplacements; -import modele.plateau.Entite; -import modele.plateau.EntiteDynamique; +import modele.donnees.Entite; +import modele.donnees.EntiteDynamique; /** * Controle4Directions permet d'appliquer une direction (connexion avec le clavier) à un ensemble d'entités dynamiques diff --git a/src/modele/deplacements/Direction.java b/src/modele/calculs/Direction.java similarity index 100% rename from src/modele/deplacements/Direction.java rename to src/modele/calculs/Direction.java diff --git a/src/modele/deplacements/Gravite.java b/src/modele/calculs/Gravite.java similarity index 88% rename from src/modele/deplacements/Gravite.java rename to src/modele/calculs/Gravite.java index d23b661..de478ac 100644 --- a/src/modele/deplacements/Gravite.java +++ b/src/modele/calculs/Gravite.java @@ -1,7 +1,7 @@ package modele.deplacements; -import modele.plateau.Entite; -import modele.plateau.EntiteDynamique; +import modele.donnees.Entite; +import modele.donnees.EntiteDynamique; public class Gravite extends RealisateurDeDeplacement { @Override diff --git a/src/modele/deplacements/IA.java b/src/modele/calculs/IA.java similarity index 100% rename from src/modele/deplacements/IA.java rename to src/modele/calculs/IA.java diff --git a/src/modele/plateau/Jeu.java b/src/modele/calculs/Jeu.java similarity index 89% rename from src/modele/plateau/Jeu.java rename to src/modele/calculs/Jeu.java index 6c7e371..6254841 100644 --- a/src/modele/plateau/Jeu.java +++ b/src/modele/calculs/Jeu.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package modele.plateau; +package modele.donnees; import modele.deplacements.Controle4Directions; import modele.deplacements.Direction; @@ -27,8 +27,8 @@ public class Jeu { private Heros hector; - private HashMap map = new HashMap(); // permet de récupérer la position d'une entité à partir de sa référence - private Entite[][] grilleEntites = new Entite[SIZE_X][SIZE_Y]; // permet de récupérer une entité à partir de ses coordonnées + private HashMap map = new HashMap(); // permet de récupérer la position d'une entité à partir de sa référence + private ElementPhysique[][] grilleEntites = new ElementPhysique[SIZE_X][SIZE_Y]; // permet de récupérer une entité à partir de ses coordonnées private Ordonnanceur ordonnanceur = new Ordonnanceur(this); @@ -80,7 +80,7 @@ public class Jeu { addEntite(new Mur(this), 3, 6); } - private void addEntite(Entite e, int x, int y) { + private void addEntite(ElementPhysique e, int x, int y) { grilleEntites[x][y] = e; map.put(e, new Point(x, y)); } @@ -147,7 +147,7 @@ public class Jeu { return pCible; } - private void deplacerEntite(Point pCourant, Point pCible, Entite e) { + private void deplacerEntite(Point pCourant, Point pCible, ElementPhysique e) { grilleEntites[pCourant.x][pCourant.y] = null; grilleEntites[pCible.x][pCible.y] = e; map.put(e, pCible); @@ -159,7 +159,7 @@ public class Jeu { return p.x >= 0 && p.x < SIZE_X && p.y >= 0 && p.y < SIZE_Y; } - private Entite objetALaPosition(Point p) { + private ElementPhysique objetALaPosition(Point p) { Entite retour = null; if (contenuDansGrille(p)) { diff --git a/src/modele/deplacements/Ordonnanceur.java b/src/modele/calculs/Ordonnanceur.java similarity index 97% rename from src/modele/deplacements/Ordonnanceur.java rename to src/modele/calculs/Ordonnanceur.java index a380bc5..825888f 100644 --- a/src/modele/deplacements/Ordonnanceur.java +++ b/src/modele/calculs/Ordonnanceur.java @@ -1,6 +1,6 @@ package modele.deplacements; -import modele.plateau.Jeu; +import modele.donnees.Jeu; import java.util.ArrayList; import java.util.Observable; diff --git a/src/modele/deplacements/RealisateurDeDeplacement.java b/src/modele/calculs/RealisateurDeDeplacement.java similarity index 92% rename from src/modele/deplacements/RealisateurDeDeplacement.java rename to src/modele/calculs/RealisateurDeDeplacement.java index 242c3bf..76dafdf 100644 --- a/src/modele/deplacements/RealisateurDeDeplacement.java +++ b/src/modele/calculs/RealisateurDeDeplacement.java @@ -1,6 +1,6 @@ package modele.deplacements; -import modele.plateau.EntiteDynamique; +import modele.donnees.EntiteDynamique; import java.util.ArrayList; diff --git a/src/modele/plateau/Colonne.java b/src/modele/donnees/Colonne.java similarity index 100% rename from src/modele/plateau/Colonne.java rename to src/modele/donnees/Colonne.java diff --git a/src/modele/plateau/Entite.java b/src/modele/donnees/Entite.java similarity index 100% rename from src/modele/plateau/Entite.java rename to src/modele/donnees/Entite.java diff --git a/src/modele/plateau/EntiteDynamique.java b/src/modele/donnees/EntiteDynamique.java similarity index 100% rename from src/modele/plateau/EntiteDynamique.java rename to src/modele/donnees/EntiteDynamique.java diff --git a/src/modele/plateau/Heros.java b/src/modele/donnees/Heros.java similarity index 100% rename from src/modele/plateau/Heros.java rename to src/modele/donnees/Heros.java diff --git a/src/modele/donnees/IA.java b/src/modele/donnees/IA.java new file mode 100644 index 0000000..53ac0e6 --- /dev/null +++ b/src/modele/donnees/IA.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package modele.donnees; + +import java.util.Random; + +/** + * Ennemis (Smicks) + */ +public class IA extends Entite { + private Random r = new Random(); + + public IA(Jeu jeu) { + super(jeu); + } + + @Override + public boolean peutEtreEcrase() { + return true; + } + + @Override + public boolean peutServirDeSupport() { + return false; + } + + @Override + public String toString() { + return null; + } +} diff --git a/src/modele/plateau/Mur.java b/src/modele/donnees/Mur.java similarity index 100% rename from src/modele/plateau/Mur.java rename to src/modele/donnees/Mur.java diff --git a/src/modele/plateau/Bot.java b/src/modele/plateau/Bot.java deleted file mode 100644 index b13b738..0000000 --- a/src/modele/plateau/Bot.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package modele.plateau; - -import java.util.Random; - -/** - * Ennemis (Smicks) - */ -public class Bot extends EntiteDynamique { - private Random r = new Random(); - - public Bot(Jeu _jeu) { - super(_jeu); - } - - public boolean peutEtreEcrase() { return true; } - public boolean peutServirDeSupport() { return true; } - public boolean peutPermettreDeMonterDescendre() { return false; }; -} diff --git a/src/modele/plateau/EntiteStatique.java b/src/modele/plateau/EntiteStatique.java deleted file mode 100644 index 0909109..0000000 --- a/src/modele/plateau/EntiteStatique.java +++ /dev/null @@ -1,14 +0,0 @@ -package modele.plateau; - -/** - * Ne bouge pas (murs...) - */ -public abstract class EntiteStatique extends Entite { - public EntiteStatique(Jeu _jeu) { - super(_jeu); - } - - public boolean peutEtreEcrase() { return false; } - public boolean peutServirDeSupport() { return true; } - public boolean peutPermettreDeMonterDescendre() { return false; }; -} \ No newline at end of file