diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java index 0785db2bc16441c74d4a5fe9fa2a66e77e88b30d..7ebb8ba3c7557ee308d144a866a67af077b7bfd2 100644 --- a/src/main/java/controller/Controller.java +++ b/src/main/java/controller/Controller.java @@ -138,9 +138,9 @@ public class Controller { entityCounts.put((pos, b) -> new Mountain(pos), initialmountaincount); entityCounts.put((pos, b) -> new Rockery(pos), 3); */ - entityCounts.put((pos, b) -> new Rock(pos), 100); - entityCounts.put((pos, b) -> new Cisor(pos), 100); - entityCounts.put((pos, b) -> new Paper(pos), 100); + entityCounts.put((pos, b) -> new Rock(pos), 10); + entityCounts.put((pos, b) -> new Cisor(pos), 10); + entityCounts.put((pos, b) -> new Paper(pos), 10); Model model = new RockPaperCisorScenario(columnCount, rowCount, entityCounts); this.setModel(model); repaintGrid(); diff --git a/src/main/java/model/rockpapercisor/Cisor.java b/src/main/java/model/rockpapercisor/Cisor.java index b35b5a6b3c17e8d3b30417123144f4fe87482f24..efbcfa74cb9a41f2dd045bd8601decf7639c0089 100644 --- a/src/main/java/model/rockpapercisor/Cisor.java +++ b/src/main/java/model/rockpapercisor/Cisor.java @@ -42,7 +42,6 @@ public class Cisor implements Entity { // Si aucune entité Rock n'est trouvée, ennemy reste null. } if(ennemy == null && target == null){ - System.err.println("all null"); return List.of(); } Position nextPos = null; diff --git a/src/main/java/model/rockpapercisor/Paper.java b/src/main/java/model/rockpapercisor/Paper.java index 9f84aa293c422a837d0bcdc186342beea324fa3b..2d28a91f9346a92d90513a2919f953269ba0ff65 100644 --- a/src/main/java/model/rockpapercisor/Paper.java +++ b/src/main/java/model/rockpapercisor/Paper.java @@ -41,7 +41,6 @@ public class Paper implements Entity { // Si aucune entité Cisor n'est trouvée, ennemy reste null. } if(ennemy == null && target == null){ - System.err.println("all null"); return List.of(); } Position nextPos = null; diff --git a/src/main/java/model/rockpapercisor/Rock.java b/src/main/java/model/rockpapercisor/Rock.java index b8db7b80353bf2e39f6bac139c73f8144a937b54..57a0d3ea42be5aba4a0e244af158daf14ddac5b8 100644 --- a/src/main/java/model/rockpapercisor/Rock.java +++ b/src/main/java/model/rockpapercisor/Rock.java @@ -41,7 +41,6 @@ public class Rock implements Entity { // Si aucune entité Paper n'est trouvée, ennemy reste null. } if(ennemy == null && target == null){ - System.err.println("all null"); return List.of(); } Position nextPos = null; diff --git a/src/main/java/model/rockpapercisor/RockPaperCisorScenario.java b/src/main/java/model/rockpapercisor/RockPaperCisorScenario.java index cdae81b08103afd9f51121cbc140512b9bcac980..c6808fbe5ce58fc660df3e4b324aa2df7af80b57 100644 --- a/src/main/java/model/rockpapercisor/RockPaperCisorScenario.java +++ b/src/main/java/model/rockpapercisor/RockPaperCisorScenario.java @@ -41,7 +41,6 @@ public class RockPaperCisorScenario extends Scenario implements Model{ // Increment the step counter this.step = this.step + 1; - System.out.println("-----------"); return changedPositions; }