Merge branch 'main' of gitlab-ssh.univ-lille.fr:2024-projet-agile-de-rentree/groupe-6

src/main/java/bitFight/ActionHeight.java

+package bitFight;
+
+public enum ActionHeight {
+    HIGH,LOW;
+}

src/main/java/bitFight/Attack.java

 package bitFight;
 
 public enum Attack implements Action {
-    PUNCH(10, "punch"),
-    KICK(20, "kick"),
-    SUPERMANPUNCH(50,"supermanpunch"),
-    DOUBLEKICK(60, "doublekick")
+    PUNCH(10, "punch", ActionHeight.HIGH),
+    KICK(20, "kick", ActionHeight.LOW),
+    SUPERMANPUNCH(50,"supermanpunch", ActionHeight.HIGH),
+    DOUBLEKICK(60, "doublekick", ActionHeight.LOW)
     ;
     private int damage;
     private String name;
+    private ActionHeight height;
     
-    Attack(int damage, String name) {
+    Attack(int damage, String name, ActionHeight height) {
         this.damage = damage;
         this.name = name;
+        this.height = height;
     }
     public int getDamage() {
         return damage;
@@ -23,4 +25,8 @@ public enum Attack implements Action {
     public String getName() {
         return name;
     }
+
+    public ActionHeight getHeight(){
+        return height;
+    }
 }
\ No newline at end of file

src/main/java/bitFight/Defense.java

 package bitFight;
 
-public class Defense implements Action {
-    public String getAction() {
+public enum Defense implements Action {
+    HIGHBLOCK("highblock",ActionHeight.HIGH),
+    LOWBLOCK("lowblock",ActionHeight.LOW);
+
+    private String name;
+    private ActionHeight height;
+
+    Defense(String name, ActionHeight height){
+        this.name = name;
+        this.height = height;
+    }
+
+    
+
+    public String getName() {
+        return name;
+    }
+
+    public ActionHeight getHeight() {
+        return height;
+    }
+
+    public Action getActionType() {
+        return this;
+    }
+
+    public String getActionTypeToString() {
         return "Defense";
     }
 }

src/main/java/bitFight/Main.java

@@ -16,6 +16,10 @@ class Main {
         menu.validate();
 
 
+        // Choix Input
+        System.out.println("a - Attaquer");
+        System.out.println("q - Quitter");
+
         // Récupère le nom de cahque attaque dans une ArrayList
         ArrayList<String> attacksNames = new ArrayList<>();
         for (Attack a : Attack.values()) {
@@ -33,36 +37,39 @@ class Main {
 
         Player player = new Player("play");
 
-        System.out.println(enemy.getCurrentHealth());
-
         while (!input.getInput().equals("q") && !enemy.isDead() && !player.isDead()) {
-            System.out.println("départ");
+            //System.out.println("départ");
 
             LocalDateTime timeBeforeAttack = LocalDateTime.now();
             int attackTime = 8 - (int)(5 * rand.nextDouble()); //A garder au début de la boucle
 
+
             // Affiche un message lors d'un input non répertorié
             if(!input.validInput()){
                 System.out.println("Error input invalid");
                 input.setInput(in.nextLine());
             }
-            System.out.println("input valide");
+            //System.out.println("input valide");
 
+            /*
             if (input.getInput().equals("a")) {
                 enemy.damage(Attack.PUNCH.getDamage());
                 System.out.println(enemy.toString());
                 System.out.println(player.toString());
                 input.setInput(in.nextLine());
-            }
+            }*/
+            
             if(Duration.between(timeBeforeAttack, LocalDateTime.now()).toSeconds() > attackTime){
                 //TODO, code pour joueur qui vient de se faire attaquer, FIN DE BOUCLE
                 System.out.println("Attaque de l'ennemi (Trop lent!!!!!!!!!!!!!!!!!!!!!)");
             } else if (input.getInput().equals("a")) {
+                System.out.println("les attaques disponible sont : \n \t punch , kick , double kikck , superman punch . \"");
                 input.setInput(in.nextLine());
                 // Boucle tant que le joueur n'a pas taper de nom d'une attaque valide
                 while (!attacksNames.contains(input.getInput())) {
                     if (!attacksNames.contains(input.getInput())){
-                        System.out.println("WARNING ! : Choose an attack in the list");
+                        //System.out.println("WARNING ! : Choose an attack in the list");
+                        System.out.println("cette attaque n'est pas disponible :( \n les attaques disponible sont : \n \t punch , kick , double kick , supermanpunch . ");
                         input.setInput(in.nextLine());
                     }
                 }
@@ -70,10 +77,12 @@ class Main {
                 enemy.damage(Attack.valueOf(attack).getDamage());
                 
                 System.out.println(enemy.toString());
+
+                System.out.println("a - Attaquer");
+                System.out.println("q - Quitter");
+
                 input.setInput(in.nextLine());
 
-            }else{
-                System.out.println("cette attaque n'est pas disponible :( \n les attaques disponible sont : \n \t punch , kick , double kikck , superman punch . ");
             }
         }
 

src/test/java/test.java → src/test/java/bitFight/test.java

+package bitFight;
 public class test {
     
 }