From c69a1f63e6bb0dd2fe58c0e314c969ebfdf792e3 Mon Sep 17 00:00:00 2001
From: gabriel mille <gabriel.mille.etu@univ-lille.fr>
Date: Thu, 5 Sep 2024 08:29:00 +0200
Subject: [PATCH] correction input
---
assets/.nfs000000000aec14f700000040 | 19 -------------------
src/main/java/bitFight/Input.java | 6 +++++-
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 assets/.nfs000000000aec14f700000040
diff --git a/assets/.nfs000000000aec14f700000040 b/assets/.nfs000000000aec14f700000040
deleted file mode 100644
index 3824c2c..0000000
--- 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 e30c23c..1c6ebd9 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() {
--
GitLab