diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 816e65f..6556d73 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -16,6 +16,9 @@ public static void main(String[] args) { //myMap.setPath(); Procedure.setRamdomRooms(myMap); Model.Procedure.setRamdomMob(myMap); + + //System.out.println(Procedure.getRandomRoom()); + myMap.FustionRoom(); new Affichage(myMap); } } diff --git a/src/main/java/Model/Map.java b/src/main/java/Model/Map.java index c173c7a..bc44bbc 100644 --- a/src/main/java/Model/Map.java +++ b/src/main/java/Model/Map.java @@ -222,7 +222,7 @@ public ArrayList getRooms(){ } //TODO c'est moche tkt (les angles marchent pas encore parfaitement - public void setPath(){ + public void FustionRoom(){ ArrayList> arrayListCell = new ArrayList<>(); for (int i = 0; i < SIZEY; i++) { ArrayList line= new ArrayList<>(); @@ -299,12 +299,16 @@ private boolean isWall(Position pos){ private boolean canPath(Position THIS, Position... pos){ int nbrMursVoisins=0; + int nbrMursVoisinsAngle=0; for (Position p : pos){ - if((isWall(p)) && (get(THIS).getType() != Cell.CellType.ANGLE)){ - nbrMursVoisins=nbrMursVoisins+1; + if(isWall(p) && get(THIS).getType() != Cell.CellType.ANGLE && p.getX()>0 && p.getX()0 && p.getY() 4; + return nbrMursVoisinsAngle < 2 && nbrMursVoisins > 4; } }