fix

TD3_DEV51_Qualite_Algo/src/main/java/fr/iutfbleau/TD3_DEV51_Qualite_Algo/Controllers/Game.java

@@ -1,122 +1,80 @@
 package fr.iutfbleau.TD3_DEV51_Qualite_Algo.Controllers;
 
+import fr.iutfbleau.TD3_DEV51_Qualite_Algo.Models.Difficulty;
 import fr.iutfbleau.TD3_DEV51_Qualite_Algo.Models.Word;
-import fr.iutfbleau.TD3_DEV51_Qualite_Algo.View.hangedManView;
+
+import java.util.*;
 
 public class Game {
     private Word word;
-    private hangedManView hangedManView;
-
     private int errors;
-    private int maxErrors = 9;
+    private List<Word> allwords;
-    private String wrongLetters;
+    private Difficulty difficulty;
-    private long startTime;
+    private final int maxErrors = 6;
-    private long endTime;
-    private final int maxTime = 120000; // 2 minutes
 
-    // Constructor
+    /* Hangmam Game */
-    public Game(Word word) {
+    public Game(Word word ,List<Word> allWord) {
         this.word = word;
-        this.hangedManView = hangedManView;
         this.errors = 0;
-        this.wrongLetters = "";
+       
-        this.startTime = System.currentTimeMillis();
+        switch (difficulty) {
-        this.endTime = 0;
+            case EASY:
-    }
+                this.word = selectWord(allWord, 0 , 7 );
-
+            break;
-    // Getters - Errors
+            case MEDIUM:
-    public int getErrors() {
+                this.word = selectWord(allWord, 0, Integer.MAX_VALUE);
-        return this.errors;
+            break;
-    }
+            case HARD:
-
+                this.allwords = selectTwoWords(allWord);
-    // Getters - Wrong Letters
+            break;
-    public String getWrongLetters() {
-        return this.wrongLetters;
-    }
-
-    // Determine if the game is lost
-    private boolean isLost() {
-        return errors >= maxErrors;
-    }
-
-    // Determine if the game is won
-    public boolean isWon() {
-        int score = calculateScore();
-        if (word.IsComplete() && score > 0) {
-            return true;
         }
-        return false;
     }
 
-    // From view, verify if the letter is correct & finish the game if necessary (lost or won)
+    /* Selected  Word with conditions */
-    public boolean playLetter(char c) {
+    private Word selectWord(List<Word> list, int min, int max) {
-        boolean correct = word.VerifyLetter(c);
+        for (Word word : list) {
-
+            int length = word.getWord().length();
-        if (!correct) {
+            if (length >= min && length <= max) {
-            errors++;
+                return word;
-            hangedManView.setState(errors);
-
-            wrongLetters += c + " ";
-            hangedManView.setWrongLetters(wrongLetters);
-
-            if (isLost()) {
-                finishedGame();
-            }
-        } else {
-            hangedManView.setCorrectLetters(word.getHiddenWord());
-
-            if (word.IsComplete()) {
-                finishedGame();
             }
         }
+        return list.getFirst();
+    }
 
+    /* Selected word level Difficult */
+    private List<Word> selectTwoWords(List<Word> list) {
+        return list.subList(0, Math.min(2, list.size())); 
+    }
+
+    public boolean playLetter(char caractere) {
+        boolean correct;
+
+        if(difficulty == Difficulty.HARD){
+            correct = this.allwords.get(0).VerifyLetter(caractere) || this.allwords.get(1).VerifyLetter(caractere);
+        } else{
+            correct = word.VerifyLetter(caractere);
+        }
+
+        if (!correct) errors++;
         return correct;
     }
 
-    // Finish the game
+    /* Verify error number  */
-    private boolean finishedGame() {
+    public int getErrors() {
-        this.endTime = System.currentTimeMillis();
+        return this.errors;
-
+    }
-        if (isLost()) {
+    /* Put error max */
-            return false;
+    public int getMaxErrors() {
-        }
+        return this.maxErrors;
-
-        boolean isWon = isWon();
-        return isWon;
     }
 
-    // For view, return the remaining time
+    /* All letter is completed : Won */ 
-    public long getRemainingTime() {
+    public boolean isWon() {
-        long elapsed = (System.currentTimeMillis() - startTime) / 1000;
+        return word.IsComplete();
-        long remaining = (maxTime / 1000) - elapsed;
-
-        if (remaining < 0) {
-            remaining = 0;
-            finishedGame();
-        }
-
-        return Math.max(remaining, 0);
     }
 
-    // Get elapsed time for calculateScore
+    /* Lost if maxErrors is greater than or egal to errors */ 
-    private long calculateTime() {
+    public boolean isLost() {
-        long elapsedTime = (endTime - startTime) / 1000;
+        return errors >= maxErrors;
-        return elapsedTime;
+    }   
-    }
+}
-
-    // Calculate Score
-    public int calculateScore() {
-        long time = calculateTime();
-        int baseScore = 1000;
-
-        int errorPenalty = errors * 50;
-        int timePenalty = (int) time * 2;
-
-        int score = baseScore - errorPenalty - timePenalty;
-        if (score < 0) {
-            score = 0;
-        }
-
-        return score;
-    }
-}

TD3_DEV51_Qualite_Algo/src/main/java/fr/iutfbleau/TD3_DEV51_Qualite_Algo/Models/Difficulty.java

@@ -0,0 +1,5 @@
+package fr.iutfbleau.TD3_DEV51_Qualite_Algo.Models;
+
+public enum Difficulty {
+    EASY, MEDIUM, HARD
+}

TD3_DEV51_Qualite_Algo/src/main/java/fr/iutfbleau/TD3_DEV51_Qualite_Algo/Models/Word.java

@@ -4,8 +4,8 @@ import java.util.*;
 
 public class Word {     
     private final String word;
-    private Letter[] tabLetter; 
+    private Letter[] tabLetter;
-    private String c;
+    private String character;
 
     private Word(String word){
         this.word = word;
@@ -14,11 +14,11 @@ public class Word {
         }
     }
     /* Lettre dans le mot */
-    public boolean VerifyLetter(char c){
+    public boolean VerifyLetter(char character){
         boolean return_bool  = false;
         for(Letter letter : this.tabLetter){
             if(!letter.getStatus()){
-                if(letter.isGood(c)){
+                if(letter.isGood(character)){
                     return_bool = true;
                 }
             }
@@ -27,7 +27,7 @@ public class Word {
     }
 
      /* Le mot a été deviné */
-    private boolean IsComplet(){
+    public boolean IsComplete(){
         for(Letter letter : this.tabLetter){
             if(!letter.getStatus()){
                 return false;
@@ -36,5 +36,8 @@ public class Word {
         }
         return true;
     }
+    public String getWord() {
+       return word;
+    }
     
 }