From b8d70effbd93f5f4853895698a331a08382ad02d Mon Sep 17 00:00:00 2001
From: HydroFlo <HydroGamer@outlook.fr>
Date: Wed, 10 Jan 2024 12:51:24 +0100
Subject: [PATCH] fin score visu + bug au boss corige
---
S1.02/Jeu/classes/Labyrinthe.class | Bin 15218 -> 15249 bytes
S1.02/Jeu/ressources/img/Score.txt | 3 ++-
S1.02/Jeu/ressources/score.csv | 2 +-
S1.02/Jeu/src/Labyrinthe.java | 13 +++++++------
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class
index 806b734ccd2472789a57862f7796915d601f3e1e..600b6815ac36f7cb5d1a9fd3695521727731bedb 100644
GIT binary patch
delta 800
zcmexVHnDueay`!D46F>S3=9m}lQ-!3X|fpYVw7iK*v8P+!o;}z|86ZUVMcM5Z44#b
z7`iqxFfcGNu4Q0g&|~19EUmA>!jQ%Iak8_1gXk9qHpZ_ELX6)S<Qcy+m@|H3ux0!?
z`G$VA=wAkI#(xZAjQ<(rm>3vzm>3xxn3yJK82E~^GVn98F^Dm-Ge|RWFeor_GN>|f
zO+IB{!^+3N%EUjJ+pxz_n1P*1ltGwDj6sS?oI#CAg28}ElEH>an!$rfoWYMtjv<su
zo*|M+lp&r;ks*yqY4QofHc3?m9ws#gDJFFW6($V^Lnbu_b0$>=TPB^!=|;Ys`V8Dm
z1`GmBhLiUixe1yua4?xN2s4>6NHUo+$TL|?7BP<EwP6rrvSpBAvSUzUvY%XS93<()
zz{}*!Ai?CqpvdIPpv>gVpvmOHpv~kp`I+$)Sw98=CVvJ6rT_*5ra%T$rXU6<reFqt
zrVxf$rqIdLO`;?t7&w?B8Mv6D8AO?47_^yU8FZPV8H||{CUcoqDyA^7Fr_kZFr_i@
zFr_mHFl8{vFl91mFl8~AFl941GUZHOVw$9x&%ne~z`)K_$iTx?#2~^{%plEF!l2Al
z#-Pbm&Y;Is!C=8u&0x(`Gg;qEh4U~2Cxb8p1Jm8jF=nZZoCcCyTNp0PV$_&?%G`-h
zUQ0_-fQ5A%L(4YC*qM{LEv_)0oBY5cvc7?VovD$5m#K+Cn5mgTnyH0Bg{hT6o2iY#
zhN+#wk*R~hgQ=6jpQ(!>jH#O;j;V(snW>K<hpC^TlxZSEGt(r7iA<9j<}*!VSjse!
zVKviqhV4u<81^#FWH`Yzi{T2>Y=*l`^B5j7Ens-Tw2<K)(;|j%Op6(rnU*lhFfC=&
ztY=!rXv(yl(U)ljV+7Mm#yF<cjCo9J7|WQ}GS)DyW1PaYo^c-22F4{!8yS}~ZDKsY
zw3+cN(^kgoOxqa0F>Pi1!?c5mooOeN0@E%gJ*M4EUQBzKQknKKWi#z(YGyjfG=b>|
t(`2TjOtYDeF|A@c!L*I(6w@)L(@Zy*&M@6!I>$KK+$x1JZ}J?gYXETrwH*Ke
delta 768
zcmbPO{;6!kay`!N46F>S3=9nMlQ-!3$ub-5Vw7iK*v8P+!o;}z|L%<p3=B++YZ(|A
zv>3Q1tLtk_4%TlF{mj6|_=Q1;@hgKo<2MF##;**vj6Wv7(61K#!@$k>mqCp2AA=m@
ze+C^U1_lQv#>o{1zM?D){7kG2VoYod(oF0O3QQafs!W`dZyDII@-nb8@lBRC>@gH#
zU}q9x5M~l(kYW;JP-7BjFkq5kuwjy7@L&>S@MDr?2xXFEh-4CBh-Xq@NMll*e8aF!
zQiXwsNtHp0NsU2;Nu9xvNtMBzNrl0dNqcg+kuRqn12>aCg8-Ak<g-R@g2oISOePG%
zOr{KyOePHSOy-kSjH7t18N`@u7-X1i8I+jpCU+YLNjfs{GC46wFgY_QGPy7)GdVG6
zGPyHoGkH$_W;{jKmqCEZk3oUSpTU4BfWee0kim&5h{2yJm?4%aWb$&8D9LaJ4yFhO
zE~Y33QKo1HZKfCoU8X1oW2X4YQl^!P$qXz^DGVG;sSG?!X$%5P=?pSV84MasnG7aO
zSqzR$*^{@JCTZp|Ffrvburn1f@GuoJh%gl~NHY~PC^MBZXfl;C=rNTuSTI#FSTj{m
zwl`DZ+`_=gAk4tPbZ&EwSt=u^q9oTAh6}S8B`4o9cbcqiahdV%<o_0t_4N$wObraY
zOpOe}Oic{ZOw9}`Of3xBOsxzyOl=H~OzjLFOdSmVOq~p2OkE6dOx+C0OuY;_OnnTc
zOcNNInI<w!WSYb<pJ^h)Ql<$EtC^-TY-gIzu$O5D!wIID3|E+DG2CUE%kYqCKEn&9
z1q|<)7BYNeTExiAw3tzbX$hldJ=0P~Q>JB%zD&y*BbZhp8%wt;3SjM!5v4&|a
z;}oWKjPsb*GcIA;z_^@gBjZM<O^o}PwlJPx+RFHxX$#|9rtOSBn07D;GVNrNXWGSN
z&9s{-jA<`Z4AVZQ5~c%8jZBA`T9}S7^)MY}n$2{aX*ttLrtM6pm`*aCW;)AsmT_{J
MRSIML<lR=+07MS1m;e9(
diff --git a/S1.02/Jeu/ressources/img/Score.txt b/S1.02/Jeu/ressources/img/Score.txt
index a5057f2..2725b4d 100644
--- a/S1.02/Jeu/ressources/img/Score.txt
+++ b/S1.02/Jeu/ressources/img/Score.txt
@@ -1,6 +1,6 @@
################################################################################
####@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@####
-#### ____ ####
+####@ ____ @####
#### / ___| ___ ___ _ __ ___ ####
#### \___ \ / __/ _ \| '__/ _ \ ####
#### ___) | (_| (_) | | | __/ ####
@@ -9,4 +9,5 @@
#### ####
#### ####
#### Pseudo : Score : ####
+#### ####
\ No newline at end of file
diff --git a/S1.02/Jeu/ressources/score.csv b/S1.02/Jeu/ressources/score.csv
index 66c06e6..3c1fa63 100644
--- a/S1.02/Jeu/ressources/score.csv
+++ b/S1.02/Jeu/ressources/score.csv
@@ -1,7 +1,7 @@
Pseudo,Score
+j,91
Hydro,38
Alex,37
Bob,37
Testeur,34
Test,32
-Cheh,31
diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java
index 56a9683..5383b79 100644
--- a/S1.02/Jeu/src/Labyrinthe.java
+++ b/S1.02/Jeu/src/Labyrinthe.java
@@ -84,7 +84,7 @@ class Labyrinthe extends Program{
String choix;
do{
choix = toLowerCase(readString());
- }while(length(choix) != 1 && length(choix) != 2);
+ }while(length(choix) != 1 && length(choix) != 2 );
return choix;
}
@@ -267,7 +267,7 @@ class Labyrinthe extends Program{
} else {
j.vie -= 10;
}
- } else if(Lab[positionL-1][positionC] == 'B'){ //Si Monstre, affiche la question.
+ } else if(Lab[positionL-1][positionC] == 'B' && !j.bossVaincu){ //Si Monstre, affiche la question.
Question q = questionRandom(listeBoss, 0);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
@@ -296,7 +296,7 @@ class Labyrinthe extends Program{
} else {
j.vie -= 10;
}
- } else if(Lab[positionL+1][positionC] == 'B'){ //Si Monstre, affiche la question.
+ } else if(Lab[positionL+1][positionC] == 'B' && !j.bossVaincu){ //Si Monstre, affiche la question.
Question q = questionRandom(listeBoss, 0);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
@@ -325,7 +325,7 @@ class Labyrinthe extends Program{
} else {
j.vie -= 10;
}
- } else if(Lab[positionL][positionC-1] == 'B'){ //Si Monstre, affiche la question.
+ } else if(Lab[positionL][positionC-1] == 'B' && !j.bossVaincu){ //Si Monstre, affiche la question.
Question q = questionRandom(listeBoss, 0);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
@@ -354,7 +354,7 @@ class Labyrinthe extends Program{
} else {
j.vie -= 10;
}
- } else if(Lab[positionL][positionC+1] == 'B'){ //Si Monstre, affiche la question.
+ } else if(Lab[positionL][positionC+1] == 'B' && !j.bossVaincu){ //Si Monstre, affiche la question.
Question q = questionRandom(listeBoss, 0);
afficheQuestion(q, true);
if(questionCorrect(q)){ //En cas de bonne réponse efface le monstre
@@ -493,6 +493,7 @@ class Labyrinthe extends Program{
}
println("#### " + file[i][0] + vide + file[i][1] + " ####");
}
+ println(readFile("ressources/img/fermeEntete.txt", true));
}
Question[] listeQuestion(String cheminFichier){ //Charge le csv des question et renvoie un tableau de question qui possède une Question par case
@@ -686,7 +687,7 @@ class Labyrinthe extends Program{
int[] indiceP = indiceDe('P', salle);
String choix = controleSaisie();
int nbMove = 1;
- if(length(choix) == 2){
+ if(length(choix) == 2 && estInt(substring(choix,1,2))){
nbMove = charToInt(charAt(choix,1));
}
for(int i = 0; i < nbMove; i ++){
--
GitLab