maj

HangmanGUI.java

@@ -2,46 +2,39 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import java.util.Timer;
-import java.util.TimerTask;
 
 /**
- * Hangman GUI with difficulty selection, dynamic score, and timer.
+ * Hangman game GUI.
- * Uses WordManager for words.
+ * Variables/methods and comments in English.
  * User-facing texts remain in French.
  */
 public class HangmanGUI extends JFrame {
-    private WordManager manager;
+    private final String[] words = {
+        "ordinateur","voiture","maison","soleil","lumiere",
+        "fromage","chocolat","montagne","riviere","plage",
+        "oiseau","papillon","musique","chateau","livre",
+        "telephone","aventure","mystere","foret","fleur",
+        "chapeau","nuage","horloge","chaise","fenetre",
+        "paysage","bouteille","parapluie","clavier","souris",
+        "brouillard","village","histoire","cerise","pomme",
+        "banane","poisson","arbre","cascade","cheval"
+    };
 
     private String secretWord;
     private final Set<Character> found = new HashSet<>();
     private final Set<Character> tried = new HashSet<>();
     private int errors = 0;
-    private static final int MAX_ERRORS = 8;
+    private static final int MAX_ERRORS = 8; // 8 steps: base, post, beam, rope, head, body, arms, legs
-    private boolean gameOver = false;
+    private boolean gameOver = false;        // indicates if the game is finished
 
-    // scoring and timing
-    private int baseScore = 200;
-    private int mistakePenalty = 15;
-    private double timePenaltyPerSecond = 1.0;
-    private long startTime;
-
-    // UI components
     private final JLabel wordLbl = new JLabel("", SwingConstants.CENTER);
     private final JLabel triedLbl = new JLabel("", SwingConstants.CENTER);
     private final JLabel infoLbl  = new JLabel("Entrez une lettre (a-z)", SwingConstants.CENTER);
-    private final JLabel scoreLbl = new JLabel("Score: 0", SwingConstants.CENTER);
-    private final JLabel timerLbl = new JLabel("Temps: 0s", SwingConstants.CENTER);
     private final JTextField input = new JTextField();
     private final JButton guessBtn = new JButton("Proposer");
     private final HangPanel hangPanel = new HangPanel();
 
-    private final String[] difficulties = {"Facile", "Moyen", "Difficile"};
+    /** Drawing panel for the hangman, progressive according to error count. */
-    private final JComboBox<String> difficultyCombo = new JComboBox<>(difficulties);
-
-    private Timer timer;
-
-    /** Drawing panel for hangman */
     private static class HangPanel extends JPanel {
         private int errors = 0;
 
@@ -57,82 +50,66 @@ public class HangmanGUI extends JFrame {
             gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 
             int w = getWidth(), h = getHeight();
-            int baseY = h - 40;
+            int baseY = h - 40; // ground level
 
             if (errors >= 1) gg.drawLine(50, baseY, w - 50, baseY);
+
             if (errors >= 2) gg.drawLine(100, baseY, 100, 60);
+
             if (errors >= 3) gg.drawLine(100, 60, 220, 60);
+
             if (errors >= 4) gg.drawLine(220, 60, 220, 90);
+
             if (errors >= 5) gg.drawOval(200, 90, 40, 40);
+
             if (errors >= 6) gg.drawLine(220, 130, 220, 200);
+
             if (errors >= 7) {
-                gg.drawLine(220, 145, 190, 165);
+                gg.drawLine(220, 145, 190, 165); 
                 gg.drawLine(220, 145, 250, 165);
             }
+
             if (errors >= 8) {
-                gg.drawLine(220, 200, 200, 240);
+                gg.drawLine(220, 200, 200, 240); 
-                gg.drawLine(220, 200, 240, 240);
+                gg.drawLine(220, 200, 240, 240); 
             }
         }
     }
 
-    /** Entry point */
+    /** Entry point: create and show the game window. */
     public static void main(String[] args) {
         SwingUtilities.invokeLater(() -> {
-            try {
+            HangmanGUI app = new HangmanGUI();
-                HangmanGUI app = new HangmanGUI();
+            app.setVisible(true);
-                app.setVisible(true);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         });
     }
 
-    /** Constructor */
+    /** Constructor: window setup, UI setup, and start the game. */
-    public HangmanGUI() throws Exception {
+    public HangmanGUI() {
         super("Jeu du Pendu");
-        manager = new WordManager();
         setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-        setSize(560, 620);
+        setSize(520, 520);
         setLocationRelativeTo(null);
         setupUI();
         startGame();
     }
 
-    /** Setup UI */
+    /** Prepare the layout and interactions. */
     private void setupUI() {
         wordLbl.setFont(new Font(Font.MONOSPACED, Font.BOLD, 28));
         triedLbl.setFont(new Font("SansSerif", Font.PLAIN, 14));
         infoLbl.setFont(new Font("SansSerif", Font.PLAIN, 14));
-        scoreLbl.setFont(new Font("SansSerif", Font.BOLD, 16));
-        timerLbl.setFont(new Font("SansSerif", Font.BOLD, 16));
 
-        JPanel top = new JPanel(new GridLayout(6, 1, 8, 8));
+        JPanel top = new JPanel(new GridLayout(3, 1, 8, 8));
         top.add(wordLbl);
         top.add(triedLbl);
         top.add(infoLbl);
 
-        JPanel scorePanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 20, 5));
-        scorePanel.add(scoreLbl);
-        scorePanel.add(timerLbl);
-        top.add(scorePanel);
-
-        JPanel diffPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
-        diffPanel.add(new JLabel("Difficulté:"));
-        diffPanel.add(difficultyCombo);
-        top.add(diffPanel);
-
-        JButton restartBtn = new JButton("Rejouer");
-        restartBtn.addActionListener(e -> startGame());
-        JPanel restartPanel = new JPanel();
-        restartPanel.add(restartBtn);
-        top.add(restartPanel);
-
         JPanel controls = new JPanel(new BorderLayout(8, 8));
         controls.add(input, BorderLayout.CENTER);
         controls.add(guessBtn, BorderLayout.EAST);
 
-        hangPanel.setPreferredSize(new Dimension(500, 300));
+        hangPanel.setPreferredSize(new Dimension(480, 300));
         JPanel center = new JPanel(new BorderLayout());
         center.add(hangPanel, BorderLayout.CENTER);
 
@@ -145,46 +122,30 @@ public class HangmanGUI extends JFrame {
         setContentPane(main);
 
         guessBtn.addActionListener(e -> onGuess());
-        input.addActionListener(e -> onGuess());
+        input.addActionListener(e -> onGuess()); 
         addWindowListener(new WindowAdapter() {
             @Override public void windowOpened(WindowEvent e) { input.requestFocusInWindow(); }
         });
     }
 
-    /** Start new game */
+    /** Start a  game. */
     private void startGame() {
-        int diffIndex = difficultyCombo.getSelectedIndex(); // 0=Facile,1=Moyen,2=Difficile
+        secretWord = pickWord();
-        int diffValue = diffIndex + 1;
-        secretWord = manager.getRandomWord(diffValue).toLowerCase(Locale.ROOT);
-
         found.clear();
         tried.clear();
         errors = 0;
         gameOver = false;
-        startTime = System.currentTimeMillis();
 
         input.setText("");
         input.setEditable(true);
         guessBtn.setEnabled(true);
         infoLbl.setText("Entrez une lettre (a-z)");
         updateUIState();
-
-        if (timer != null) timer.cancel();
-        timer = new Timer(true);
-        timer.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                SwingUtilities.invokeLater(() -> {
-                    updateScoreLabel();
-                    updateTimerLabel();
-                });
-            }
-        }, 0, 200);
     }
 
-    /** Handle guess */
+    /** Handle a guess: validate input, update state, check for end of game. */
     private void onGuess() {
-        if (gameOver) return;
+        if (gameOver) return; // block input after game end
 
         String s = input.getText().trim().toLowerCase(Locale.ROOT);
         if (s.length() != 1 || s.charAt(0) < 'a' || s.charAt(0) > 'z') {
@@ -204,7 +165,7 @@ public class HangmanGUI extends JFrame {
         tried.add(c);
         boolean hit = false;
         for (int i = 0; i < secretWord.length(); i++) {
-            if (secretWord.charAt(i) == c) {
+            if (Character.toLowerCase(secretWord.charAt(i)) == c) {
                 found.add(c);
                 hit = true;
             }
@@ -221,17 +182,15 @@ public class HangmanGUI extends JFrame {
         input.requestFocusInWindow();
     }
 
-    /** Update UI */
+    /** Refresh labels/drawing and handle end-of-game. */
     private void updateUIState() {
         wordLbl.setText(maskWord(secretWord, found));
         triedLbl.setText("Lettres essayées : " + joinChars(tried));
         hangPanel.setErrors(errors);
-        updateScoreLabel();
-        updateTimerLabel();
 
         if (isWin(secretWord, found)) {
             infoLbl.setText("Bravo ! Vous avez trouvé le mot : " + secretWord);
-            wordLbl.setText(spaced(secretWord));
+            wordLbl.setText(spaced(secretWord)); // pretty display of the word
             gameOver = true;
             disableInput();
         } else if (errors >= MAX_ERRORS) {
@@ -240,30 +199,25 @@ public class HangmanGUI extends JFrame {
             gameOver = true;
             disableInput();
         }
+
+        // force UI refresh
+        revalidate();
+        repaint();
     }
 
-    /** Update dynamic score */
+    /** Disable controls after the game ends. */
-    private void updateScoreLabel() {
-        long elapsedMillis = System.currentTimeMillis() - startTime;
-        double elapsedSeconds = elapsedMillis / 1000.0;
-        int score = (int) (baseScore - errors * mistakePenalty - elapsedSeconds * timePenaltyPerSecond);
-        scoreLbl.setText("Score: " + Math.max(score, 0));
-    }
-
-    /** Update dynamic timer */
-    private void updateTimerLabel() {
-        long elapsedMillis = System.currentTimeMillis() - startTime;
-        int seconds = (int) (elapsedMillis / 1000);
-        timerLbl.setText("Temps: " + seconds + "s");
-    }
-
-    /** Disable input after end */
     private void disableInput() {
         input.setEditable(false);
         guessBtn.setEnabled(false);
-        if (timer != null) timer.cancel();
     }
 
+    /** Pick a random word. */
+    private String pickWord() {
+        Random rnd = new Random();
+        return words[rnd.nextInt(words.length)].toLowerCase(Locale.ROOT);
+    }
+
+    /** Build the masked word based on found letters. */
     private String maskWord(String secret, Set<Character> foundSet) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < secret.length(); i++) {
@@ -276,6 +230,7 @@ public class HangmanGUI extends JFrame {
         return sb.toString();
     }
 
+    /** True if all letters have been found. */
     private boolean isWin(String secret, Set<Character> foundSet) {
         for (int i = 0; i < secret.length(); i++) {
             char lc = Character.toLowerCase(secret.charAt(i));
@@ -284,6 +239,7 @@ public class HangmanGUI extends JFrame {
         return true;
     }
 
+    /** Sort and join letters for display. */
     private String joinChars(Set<Character> set) {
         java.util.List<Character> list = new ArrayList<>(set);
         Collections.sort(list);
@@ -295,6 +251,7 @@ public class HangmanGUI extends JFrame {
         return sb.toString();
     }
 
+    /** Add spaces between letters for nicer reading. */
     private String spaced(String s) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < s.length(); i++) {

src/WordManager.java

@@ -1,57 +0,0 @@
-import java.io.*;
-import java.util.*;
-
-public class WordManager {
-
-    // --- Constant: path to word file ---
-    private static final String WORD_FILE = "../res/hangman_words.txt";
-
-    // --- Map to store words by difficulty ---
-    private final Map<String, List<String>> wordsByDifficulty = new HashMap<>();
-
-    // --- Constructor ---
-    public WordManager() throws IOException {
-        wordsByDifficulty.put("EASY", new ArrayList<>());
-        wordsByDifficulty.put("MEDIUM", new ArrayList<>());
-        wordsByDifficulty.put("HARD", new ArrayList<>());
-        loadWords(); // automatically load words when created
-    }
-
-    // --- Load words from the file ---
-    private void loadWords() throws IOException {
-        try (BufferedReader reader = new BufferedReader(new FileReader(WORD_FILE))) {
-            String line;
-            String section = "";
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.startsWith("#")) {
-                    section = line.substring(1).toUpperCase(); // read difficulty section
-                } else if (!line.isEmpty() && wordsByDifficulty.containsKey(section)) {
-                    wordsByDifficulty.get(section).add(line);
-                }
-            }
-        } catch (FileNotFoundException e) {
-            throw new IOException("File not found: " + WORD_FILE);
-        }
-    }
-
-    // --- Get a random word based on difficulty (1 = Easy, 2 = Medium, 3 = Hard) ---
-    public String getRandomWord(int difficulty) {
-        String key = difficultyToKey(difficulty);
-        List<String> list = wordsByDifficulty.get(key);
-        if (list == null || list.isEmpty()) return null;
-
-        Random rand = new Random();
-        return list.get(rand.nextInt(list.size()));
-    }
-
-    // --- Convert int to difficulty key ---
-    private String difficultyToKey(int difficulty) {
-        return switch (difficulty) {
-            case 1 -> "EASY";
-            case 2 -> "MEDIUM";
-            case 3 -> "HARD";
-            default -> "EASY"; // default difficulty
-        };
-    }
-}