From e30233e7a48a9ae01d0de56cd3a3b4c9c2f56885 Mon Sep 17 00:00:00 2001
From: fefe <hofer.francois.01@gmail.com>
Date: Thu, 9 Jan 2020 23:24:17 +0100
Subject: [PATCH] Forgot to push the last version of hangman

---
 src/main/java/ch/hepia/Hangman/Hangman.class | Bin 1078 -> 4125 bytes
 src/main/java/ch/hepia/Hangman/Hangman.java  |  39 ++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ch/hepia/Hangman/Hangman.class b/src/main/java/ch/hepia/Hangman/Hangman.class
index 676ac5f1ee93690df964a5a12c0f21183a53aa68..e205797f684b6fed7d08023cd7e7c99884d938f9 100644
GIT binary patch
literal 4125
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

literal 1078
zcmZuwTTjzq7=FIBqg_{EFvejU!VqvA#zYi_0V+!jB#0Oc#&}gm1B0z2qcbt#l3(G4
zA;iQ>4;Ry@@dx-f`~lt*JUm}F0}4(0o{!Jle*5+5D}bBG8fZa}hF$|cBn<T7vLyXd
z9gt)&fGbGq7&0)75lKdMq;!nwNE-;@s)lh5*9017@=o5J6Ht;vYXWMvv|$T0FXbJ3
zxl&xW%a5$}0xkaBmYv%Xm`W~fThFX?!E!d!t8O{(Y-Y||vP0)>0*$M#mD{;*?bd4s
zcA4%juo4?57rp*PEAI%jC!d}#ApOQ_sZ!3__wsTkQ>GRzXG~6Hq7`9*j{m2dujC6G
zc3HY7G+Z}v1Cu5pyk%kv(<U;Q(J*Ub4z~qFO2Zu!cQIjN9uqX|^Gyrry|riGL>Hn0
zTD`SE=(OR3^=&)n3PdizNDhA{w1ynvFWAneyXC>ZNHw=*mG82Igd-~u*t6Yi-Q-U$
zW@Q!KE&a`IOJ0cc**?$rT)W8frHUM^25P>PUXjSNjBOP&0%325f6Y9(cOLHQ@q&W{
zKb#hRe}D=h;U;aP)=e(R{lgz1-cevD(gx4So1q;Ylx65H6!^)<Kg0Kg;mWcysYcY1
zD%2xHM<Qw!{`et`R78ze(Qu%O*T27~s?gpt$>)`gvM_rgKpugH9_SdPJc=MX>1l-W
z6Q%~A=sISYArDsX{)HtJhCEhgVj=wq4`VNoP-f$yz!6&BLvIaKVI26_^G96^#$IAT
z$|gNA^$<a+G*XGGuWCw@%n{6aBUi7@IE^OC&73R*lbE#;tvGofrD4J`MnEPxZHB{T
z5yJw#D~w+w#&U-+v=c6Hf}l7?SnD+9CIJS<>zgFVJ;?nZ(R>QI{Plr;-e-XBZf~AT
Fe*jLY&>jE)

diff --git a/src/main/java/ch/hepia/Hangman/Hangman.java b/src/main/java/ch/hepia/Hangman/Hangman.java
index ba7b73e..e099337 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");
     }
 
     
-- 
GitLab