Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/Main.java
Yann-Forner · Mar 18, 2021 · 7d021bd · 7d021bd
2 parents 441e882 + f70650c
commit 7d021bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -1 +1 @@
-import Model.Entitys.BasicPlayer;import Model.Map.Cell;import Model.Map.Etage;import Model.Map.Map;import Model.Utils.Affichage;import Model.Utils.Position;import Model.Utils.Procedure;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;import java.util.ArrayList;import java.util.Random;public class Main {    private static long seed;    private static Map map;    private static BasicPlayer player;    private static Etage etage;    public static void main(String[] args) throws IOException {        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));        init(reader);        affichage();        while (true) {            Tour(reader.readLine());        }    }    public static void testAstar() {        Position posPlayer = player.getPosition();        Position posTarget = Procedure.getAccesibleRandomPosition(false, etage);        ArrayList<Position> chemin = etage.Astar(posPlayer, posTarget, Etage.PathType.DIAGONAL);        for (Position p : chemin) {            etage.Cells.get(p.getY()).get(p.getX()).updateCell(true, Cell.CellType.PATH);        }        etage.Cells.get(posTarget.getY()).get(posTarget.getX()).updateCell(true, Cell.CellType.TRAP_ROOM);    }    private static void init(BufferedReader reader) throws IOException {        System.out.print("Numero seed ? ");        long seed_value;        try{            seed_value = Long.parseLong(reader.readLine());        }        catch (NumberFormatException e){            seed_value =new Random().nextLong();        }        seed=seed_value;        Procedure.setSeed(seed);        map = new Map();        etage = map.getCurrent();        player = map.getPlayer();    }    private static void Tour(String input){        switch (input) {            case "z" , "\u001B[A" -> player.moveUp();            case "q" , "\u001B[D" -> player.moveLeft();            case "s" , "\u001B[B" -> player.moveDown();            case "d" , "\u001B[C" -> player.moveRight();            case "exit" -> System.exit(0);            default -> System.out.println("Wrong key:"+input);        }        switch (etage.get(map.getPlayer().getPosition()).getType()){            case UP :                map.UP();                break;            case DOWN :                map.DOWN();                break;            case TRAP_ROOM :                map.TRAP_ROOM();                break;            default:                break;        }        etage=map.getCurrent();        affichage();    }    private static void affichage(){        System.out.print(Affichage.CLEAR);        System.out.println(seed);        System.out.println(etage);        System.out.print(Affichage.RESET+"Etage n°"+(map.getIndexCurrent()+1));        System.out.println("\n\n\n\n\n\n\n\n\n\n\n");        System.out.print("Enter your key: ");    }}
+import Model.Entitys.BasicPlayer;import Model.Map.Cell;import Model.Map.Etage;import Model.Map.Map;import Model.Utils.Affichage;import Model.Utils.Position;import Model.Utils.Procedure;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;import java.util.ArrayList;import java.util.Random;public class Main {    private static long seed;    private static Map map;    private static BasicPlayer player;    private static Etage etage;    public static void main(String[] args) throws IOException {        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));        init(reader);        testAstar();        affichage();        System.getProperty("os.name");        while (true) {            Tour(reader.readLine());        }    }    public static void testAstar() {        Position posPlayer = player.getPosition();        Position posTarget = Procedure.getAccesibleRandomPosition(false, etage);        ArrayList<Position> chemin = etage.Astar(posPlayer, posTarget, Etage.PathType.DIAGONAL);        for (Position p : chemin) {            etage.Cells.get(p.getY()).get(p.getX()).updateCell(true, Cell.CellType.PATH);        }        System.out.println("Taille chemin : " + chemin.size());        etage.Cells.get(posTarget.getY()).get(posTarget.getX()).updateCell(true, Cell.CellType.TRAP_ROOM);    }    private static void init(BufferedReader reader) throws IOException {        System.out.print("Numero seed ? ");        long seed_value;        try{            seed_value = Long.parseLong(reader.readLine());        }        catch (NumberFormatException e){            seed_value =new Random().nextLong();        }        seed=seed_value;        Procedure.setSeed(seed);        map = new Map();        etage = map.getCurrent();        player = map.getPlayer();    }    private static void Tour(String input){        switch (input) {            case "z" , "\u001B[A" -> player.moveUp();            case "q" , "\u001B[D" -> player.moveLeft();            case "s" , "\u001B[B" -> player.moveDown();            case "d" , "\u001B[C" -> player.moveRight();            case "exit" -> System.exit(0);            default -> System.out.println("Wrong key:"+input);        }        switch (etage.get(map.getPlayer().getPosition()).getType()){            case UP :                map.UP();                break;            case DOWN :                map.DOWN();                break;            case TRAP_ROOM :                map.TRAP_ROOM();                break;            default:                break;        }        etage=map.getCurrent();        affichage();    }    private static void affichage(){        System.out.print(Affichage.CLEAR);        System.out.println(seed);        System.out.println(etage);        System.out.print(Affichage.RESET+"Etage n°"+(map.getIndexCurrent()+1));        System.out.println("\n\n\n\n\n\n\n\n\n\n\n");        System.out.print("Enter your key: ");    }}

diff --git a/src/main/java/Model/Entitys/Entity.java b/src/main/java/Model/Entitys/Entity.java
@@ -13,6 +13,8 @@ public Entity(Etage m, Position pos) {
         etage = m;
     }
 
+   // public abstract void update();
+
     public Position getPosition() {
         return position.copyOf();
     }

diff --git a/src/main/java/Model/Map/Etage.java b/src/main/java/Model/Map/Etage.java
@@ -205,8 +205,11 @@ public ArrayList<Position> Astar(Position depart, Position arrive, PathType path
                 if (!(closedList.contains(n)) || n.getScore() < u.getScore()){
                     if(openList.contains(n)){
                         openList.remove(n);
+                        openList.add(n);
+                    }
+                    else {
+                        openList.add(n);
                     }
-                    openList.add(n);
                 }
             }
             closedList.add(u);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import Model.Entitys.BasicPlayer;import Model.Map.Cell;import Model.Map.Etage;import Model.Map.Map;import Model.Utils.Affichage;import Model.Utils.Position;import Model.Utils.Procedure;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;import java.util.ArrayList;import java.util.Random;public class Main { private static long seed; private static Map map; private static BasicPlayer player; private static Etage etage; public static void main(String[] args) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); init(reader); affichage(); while (true) { Tour(reader.readLine()); } } public static void testAstar() { Position posPlayer = player.getPosition(); Position posTarget = Procedure.getAccesibleRandomPosition(false, etage); ArrayList<Position> chemin = etage.Astar(posPlayer, posTarget, Etage.PathType.DIAGONAL); for (Position p : chemin) { etage.Cells.get(p.getY()).get(p.getX()).updateCell(true, Cell.CellType.PATH); } etage.Cells.get(posTarget.getY()).get(posTarget.getX()).updateCell(true, Cell.CellType.TRAP_ROOM); } private static void init(BufferedReader reader) throws IOException { System.out.print("Numero seed ? "); long seed_value; try{ seed_value = Long.parseLong(reader.readLine()); } catch (NumberFormatException e){ seed_value =new Random().nextLong(); } seed=seed_value; Procedure.setSeed(seed); map = new Map(); etage = map.getCurrent(); player = map.getPlayer(); } private static void Tour(String input){ switch (input) { case "z" , "\u001B[A" -> player.moveUp(); case "q" , "\u001B[D" -> player.moveLeft(); case "s" , "\u001B[B" -> player.moveDown(); case "d" , "\u001B[C" -> player.moveRight(); case "exit" -> System.exit(0); default -> System.out.println("Wrong key:"+input); } switch (etage.get(map.getPlayer().getPosition()).getType()){ case UP : map.UP(); break; case DOWN : map.DOWN(); break; case TRAP_ROOM : map.TRAP_ROOM(); break; default: break; } etage=map.getCurrent(); affichage(); } private static void affichage(){ System.out.print(Affichage.CLEAR); System.out.println(seed); System.out.println(etage); System.out.print(Affichage.RESET+"Etage n°"+(map.getIndexCurrent()+1)); System.out.println("\n\n\n\n\n\n\n\n\n\n\n"); System.out.print("Enter your key: "); }}
		import Model.Entitys.BasicPlayer;import Model.Map.Cell;import Model.Map.Etage;import Model.Map.Map;import Model.Utils.Affichage;import Model.Utils.Position;import Model.Utils.Procedure;import java.io.BufferedReader;import java.io.IOException;import java.io.InputStreamReader;import java.util.ArrayList;import java.util.Random;public class Main { private static long seed; private static Map map; private static BasicPlayer player; private static Etage etage; public static void main(String[] args) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); init(reader); testAstar(); affichage(); System.getProperty("os.name"); while (true) { Tour(reader.readLine()); } } public static void testAstar() { Position posPlayer = player.getPosition(); Position posTarget = Procedure.getAccesibleRandomPosition(false, etage); ArrayList<Position> chemin = etage.Astar(posPlayer, posTarget, Etage.PathType.DIAGONAL); for (Position p : chemin) { etage.Cells.get(p.getY()).get(p.getX()).updateCell(true, Cell.CellType.PATH); } System.out.println("Taille chemin : " + chemin.size()); etage.Cells.get(posTarget.getY()).get(posTarget.getX()).updateCell(true, Cell.CellType.TRAP_ROOM); } private static void init(BufferedReader reader) throws IOException { System.out.print("Numero seed ? "); long seed_value; try{ seed_value = Long.parseLong(reader.readLine()); } catch (NumberFormatException e){ seed_value =new Random().nextLong(); } seed=seed_value; Procedure.setSeed(seed); map = new Map(); etage = map.getCurrent(); player = map.getPlayer(); } private static void Tour(String input){ switch (input) { case "z" , "\u001B[A" -> player.moveUp(); case "q" , "\u001B[D" -> player.moveLeft(); case "s" , "\u001B[B" -> player.moveDown(); case "d" , "\u001B[C" -> player.moveRight(); case "exit" -> System.exit(0); default -> System.out.println("Wrong key:"+input); } switch (etage.get(map.getPlayer().getPosition()).getType()){ case UP : map.UP(); break; case DOWN : map.DOWN(); break; case TRAP_ROOM : map.TRAP_ROOM(); break; default: break; } etage=map.getCurrent(); affichage(); } private static void affichage(){ System.out.print(Affichage.CLEAR); System.out.println(seed); System.out.println(etage); System.out.print(Affichage.RESET+"Etage n°"+(map.getIndexCurrent()+1)); System.out.println("\n\n\n\n\n\n\n\n\n\n\n"); System.out.print("Enter your key: "); }}
Expand Down