update

mohamedlouay · May 6, 2021 · 6c53c34 · 6c53c34
1 parent 814edde
commit 6c53c34
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_06_05_2021_10_06__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_06_05_2021_10_06__Default_Changelist_.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/Rogue_like_jar/Rogue-like.jar b/out/artifacts/Rogue_like_jar/Rogue-like.jar
diff --git a/src/main/java/GameSystem.java b/src/main/java/GameSystem.java
@@ -11,8 +11,8 @@ public class GameSystem {
 
 
 
-    public int lignes =25;
-    public int colonnes =150 ;
+    public int lignes =20;
+    public int colonnes =80 ;
     Scanner scanner = new Scanner(System.in);
 
     public GameSystem()

diff --git a/src/main/java/World.java b/src/main/java/World.java
@@ -239,7 +239,7 @@ private void tryMoveEnemy (int targetX ,int targetY,Enemy enemy,Player player)
             }
             default: {
 
-                battleEnemey(player ,targetX,targetY ) ;// battle with the player
+                break;
 
             }
 

diff --git a/src/main/java/generationProcedurale/ConstructeurDuMonde.java b/src/main/java/generationProcedurale/ConstructeurDuMonde.java
@@ -15,7 +15,7 @@ public class ConstructeurDuMonde {
     Tile[][] tiles;
     int lignes;
     int colonnes;
-    private int maxRooms = 20;
+    private int maxRooms = 4;
     private int maxRoomSize = 10;
     private int minRoomSize = 5;
     Random random = new Random();
@@ -27,9 +27,6 @@ public class ConstructeurDuMonde {
     public ConstructeurDuMonde(Player player, int lignes, int colonnes) {
         this.lignes = lignes;
         this.colonnes = colonnes;
-        this.maxRooms = maxRooms;
-        this.maxRoomSize = maxRoomSize;
-        this.minRoomSize = minRoomSize;
         tiles = create(lignes, colonnes);
         placeRooms();
         initPlayerPosition(player);
@@ -149,10 +146,10 @@ public void placeRooms() {
         int i = 0;
         while (i < maxRooms && nbTry < 1000) {
             nbTry++;
-            int w = minRoomSize + random.nextInt(maxRoomSize - minRoomSize + 1) + 10;
+            int w = minRoomSize + random.nextInt(maxRoomSize - minRoomSize + 1)+5 ;
             int h = minRoomSize + random.nextInt(maxRoomSize - minRoomSize + 1);
             int x = random.nextInt(colonnes - w - 1) + 1;
-            int y = random.nextInt(lignes - h - 1 - 10) + 1;
+            int y = random.nextInt(lignes - h - 1) + 1;
 
             // create room with randomized values
             Room newRoom = new Room(x, y, w, h);
@@ -249,7 +246,7 @@ public void initEnemiesPosition(Player player) {
         int level = player.getLevel();
         for (Room r : rooms) {
 
-            int nbrEnemyPerRoom = random.nextInt(level + 3);//nombre d'ennemies dans une salle est proportionnel au level de player
+            int nbrEnemyPerRoom = random.nextInt(level + 1);//nombre d'ennemies dans une salle est proportionnel au level de player
             int nbEnemy = 1;
             while (nbEnemy <= nbrEnemyPerRoom) {
                 nbEnemy++;
@@ -308,7 +305,7 @@ public void initItemsPosition(Player player) {
 
 
         for (Room r : rooms) {
-            int nbrItemPerRoom = random.nextInt(level + 3);//nombre items dans une salle est proportionnel au level de player
+            int nbrItemPerRoom = random.nextInt(level + 1);//nombre items dans une salle est proportionnel au level de player
             int nbItem = 1;
             while (nbItem <= nbrItemPerRoom) {
                 nbItem++;
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 default: {
-                    battleEnemey(player ,targetX,targetY ) ;// battle with the player
+                    break;
                 }
@@ Expand Down @@