wip

LaurisHebert · Sep 6, 2019 · c3d4aa0 · c3d4aa0
1 parent de54763
commit c3d4aa0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/src/Main.java b/src/Main.java
@@ -20,14 +20,14 @@ private static void executeGame() {
             while (mode.canPlayAgain()) {
                 mode.round();
             }
-            if (mode.hasWon() && mode.hasLost()){
-                System.out.println("Ex aequo");
+            if (mode.hasLost() && !mode.hasWon()) {
+                System.out.println("\nYou lose \nThe answer was" + Arrays.toString(mode.defenseNumber));
             }
-            else if (mode.hasWon()) {
-                System.out.println("We have a winner !");
+            if (mode.hasWon() && !mode.hasLost()){
+                System.out.println("Ex aequo");
             }
-            else if (mode.hasLost()) {
-                System.out.println("\nYou lose \nThe answer was" + Arrays.toString(mode.defenseNumber));
+            if (mode.hasWon() && mode.hasLost()) {
+                 System.out.println("We have a winner !");
             }
             if (!mode.canPlayAgain() && !mode.hasWon() && !mode.hasLost()){
                 System.out.println("Everyone lose" +

diff --git a/src/com/pda/games/Duel.java b/src/com/pda/games/Duel.java
@@ -88,7 +88,7 @@ private void botTurn(){
     @Override
     public void round() {
         botDefenseNumber();
-        System.out.println(Arrays.toString(botDefenseNumber));
+        System.out.println(Arrays.toString(defenseNumber));
         humanTurn();
         botTurn();
         round++;

diff --git a/src/com/pda/games/GetIn.java b/src/com/pda/games/GetIn.java
@@ -21,27 +21,31 @@ public static int[] getRandomArray(int size, int minRange, int maxRange) {
 
 
     private static int[] humanArray(int size, int minRange, int maxRange) {
-        int[] humanNumber = new int[size];
+        int[] humanNumbers = new int[size];
+        String numbers = sc.nextLine();
+        String[] number = numbers.split(" ");
         for (int i = 0; i < size; i++) {
-            humanNumber[i] = tryCatch();
-            while (humanNumber[i] < minRange || humanNumber[i] > maxRange) {
-                System.out.println(humanNumber[i] + " are not between" + minRange + "/" + maxRange);
-                humanNumber[i] = tryCatch();
+            try {
+                humanNumbers[i] = Integer.parseInt(number[i]);
+            }catch (ArrayIndexOutOfBoundsException e){
+                System.out.println("Need more digits");
+                humanArray(size, minRange, maxRange);
+            }catch (NumberFormatException e) {
+                System.out.println("One of your \"digits\" is not a digit");
+                humanArray(size, minRange, maxRange);
             }
-        }return humanNumber;
+            if (!verify(humanNumbers[i], i, minRange, maxRange, size)) {
+                System.out.println("One of your digits are not between" + minRange + "/" + maxRange);
+                humanArray(size, minRange, maxRange);
+            }
+        } return humanNumbers;
     }
 
     public static int[] getHumanArray(int size, int minRange, int maxRange) {
         return humanArray(size, minRange, maxRange);
     }
 
-    private static int tryCatch() {
-        try {
-            return sc.nextInt();
-        } catch (InputMismatchException e) {
-            System.out.println("One of them is not a digit");
-            sc.next();
-            return tryCatch();
-        }
+    static private boolean verify(int humanNumber, int i,int minRange, int maxRange, int size){
+        return minRange > humanNumber || humanNumber < maxRange;
     }
 }