diff --git a/src/main/java/ch/hepia/Hangman/Hangman.class b/src/main/java/ch/hepia/Hangman/Hangman.class index 676ac5f1ee93690df964a5a12c0f21183a53aa68..e205797f684b6fed7d08023cd7e7c99884d938f9 100644 Binary files a/src/main/java/ch/hepia/Hangman/Hangman.class and b/src/main/java/ch/hepia/Hangman/Hangman.class differ diff --git a/src/main/java/ch/hepia/Hangman/Hangman.java b/src/main/java/ch/hepia/Hangman/Hangman.java index ba7b73e491a5644b9194291ee3ddecbbdcf16d11..e099337a9e0c7ce5aff7d07b4892a11fd2a80b1f 100644 --- a/src/main/java/ch/hepia/Hangman/Hangman.java +++ b/src/main/java/ch/hepia/Hangman/Hangman.java @@ -1,3 +1,4 @@ +import java.util.Scanner; public class Hangman { private String secretWord; private String currWord; @@ -26,7 +27,7 @@ public class Hangman { private int attemps(){ return this.attemp; } - private String secretWord(){ + public String secretWord(){ return this.secretWord; } private boolean lastTry(){ @@ -39,6 +40,7 @@ public class Hangman { printHang(this.failedAttempts()); } public void printGallowIfError(){ + System.out.println("Error(s): " + this.failedAttempts()); if (!this.lastTry()){ printHang(this.failedAttempts()); } @@ -82,6 +84,18 @@ public class Hangman { return true; } + private static char askLetter(){ + System.out.println("Enter a letter :"); + Scanner myObj = new Scanner(System.in); + String str = myObj.nextLine(); + if (str.length() != 1){ + System.out.println(" Just one letter please : "); + str = myObj.nextLine(); + } + return str.charAt(0); + } + + private static void printHang(int i){ String i0 = ""; String i1 = "----------\n|/\n|\n|\n|\n|\n|\n|"; @@ -96,11 +110,26 @@ public class Hangman { String [] drawHangMan = {i0, i1, i2, i3, i4, i5, i6, i7, i8, i9}; System.out.println(drawHangMan[i]); } - public static void main(String[] args){ - Hangman h = Hangman.withSecretWord("mystère"); - String currentWord = h.currentWord(); - + public static void runGame(String secretWord){ + Hangman h = Hangman.withSecretWord(secretWord); + while(!h.isFinished()){ + System.out.println("-----------------"); + char askedChar = Hangman.askLetter(); + h = h.tryWith(askedChar); + h.printCurrentWord(); + h.printGallowIfError(); + } + if(h.hasWon()){ + System.out.println("Goal Achieved !"); + } + else{ + System.out.println("That's an horrible fail, you had to find: " + h.secretWord() ); + } + } + + public static void main(String[] args){ + Hangman.runGame("helloworld"); }