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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
F0RYyuR%!qM
literal 1078
zcmX^0Z`VEs1_pBmXD$Xo26=V{1uh0A21PCgB?e^>p#tKnf(SKE26YAv4hBsw1}z3{
z5TV1tpv%Fa$HAb_#UQ|7z|LUE&S1pIz-E(~msw)R$iS?j8OF%K;+&t7%E-X)lbM(5
zSDKrYS`?C)l#|NHz?z(qnw-tZV5#Agl~|UjpOcuEt{+@dl$n=qjVa=+i7Cd&z#CkW
zn4ImKSO7JXv!Ez5uf!uUFP)KrMZ*(pe{N!C9wUR8Ml_}YAbGCf{L-T2RJTl!n|MH4
za})FQKrZ585MmH!WDp0jkzMChnwgW5S_G0dW@j+rVK8Md<6$sou;5{^WU%64ux7Af
zXRzgAuw$@iWMI@~XK>(QaAYv%VQ^wFW@KQjVPs&`XJp_|fPfkv21y1fMh14M)r<@R
z2n+p_vQm>v7#T#dgb~Q`NJ=3g$H>5zlbV-ak^v5WPeul|<c!23#}Y_zI5RSE7N?dt
zLxos1Je@(NaFpc3bc<+U4QFI~DvL`}a~T<!^GiVvg9K`3zJ35G<bz9!QWJBn85xAZ
zen1swWMBnH4<iFRn9j*#P-GBb5M%%W76wL8a5FG6h%hiP$TBc8FfuSOuxf2*VBE;S
zz`)2L%D}+D1{P#w;9?MC5Qi!)U|?ooWnf@1+|9rgskNPf*^k+bMU+K*8w1NC1}SY(
zmTe5IG7A{EbVXTYwlT1^urMzF|5$e$1N#OB1_mauu~H0dAiEei8Q2&^8Q2-*88{f!
z7}ywe7`PcE7#J9M8JPbv@USy5F-rboU}fL}MHtlfJq%0?%nS?+;mkJD0vwAN0;Oj$
zC^Fm12yiZ95ZuJTA;h_jfvbgyaryuEP#(ARJO)(|n`avXmo&=)25u0CcN+tj6w49_
zhYzHOk#YI|^&qc9+-SwX$H2hA&%nVTz`(;G$RNTX#2~{U$e_d^!l1<<#-PU_&S1tM
z!C=iG$>7W&&EUZx!w|s0&k)9-2=;?81N$EaCdNMu+>E~%gxMu{KtADQkY<p9`a}^H
f<g7aw_(AqUf*h3f85mR;SQu0p7#U>2VI~IvPN~oy
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