diff --git a/assets/.nfs000000000aec14f700000040 b/assets/.nfs000000000aec14f700000040 deleted file mode 100644 index 3824c2cfa6d57ed073ec9ad88effe88f20d33bf0..0000000000000000000000000000000000000000 --- a/assets/.nfs000000000aec14f700000040 +++ /dev/null @@ -1,19 +0,0 @@ -________________________________________________________________________________________________________________________ - - - - - - - - - - -________________________________________________________________________________________________________________________ - -Commandes : - - a - Attaquer - q - Quitter - -________________________________________________________________________________________________________________________ \ No newline at end of file diff --git a/src/main/java/bitFight/Input.java b/src/main/java/bitFight/Input.java index e30c23caf3e36f3e8f3384c334961d2f077c816d..1c6ebd97096bfab244afbcd735eaef8652290b09 100644 --- a/src/main/java/bitFight/Input.java +++ b/src/main/java/bitFight/Input.java @@ -28,7 +28,7 @@ public class Input { } public void newInput(String input) { - while (!validInput()) { + do { try { setInput(input); } catch (InvalidInputException e) { @@ -39,12 +39,16 @@ public class Input { } } } + while (!validInput()); + } public Input() { this.inputRange = new ArrayList<>(); this.inputRange.add("q"); //Commande pour quitter this.inputRange.add("a"); //Commande pour attaquer + for (Attack a : Attack.values()) this.inputRange.add(a.getName()); + for (Defense d : Defense.values()) this.inputRange.add(d.getName()); } public boolean validInput() {