From 5fa48509679210f587b84eec1464db2e44fd6329 Mon Sep 17 00:00:00 2001
From: HydroFlo <HydroGamer@outlook.fr>
Date: Mon, 8 Jan 2024 11:59:59 +0100
Subject: [PATCH] mob rando

---
 S1.02/Jeu/classes/Labyrinthe.class | Bin 13875 -> 13961 bytes
 S1.02/Jeu/ressources/Lab/Salle0    |   2 +-
 S1.02/Jeu/ressources/Lab/Salle2    |   2 +-
 S1.02/Jeu/src/Labyrinthe.java      |  12 +++++++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class
index bedfc10445f75c9406f8abea3a794b5a0775df15..29aa85b21757c0e0feca8c46d266f4e73015c800 100644
GIT binary patch
delta 2049
zcmdm-)0xY4>ff$?3=9mmj7K(dH45>tIdCw50S9C0<US#3gK{1QH->gD1`ftb9>yxh
zYDNZ*%)FG$<W!ebMg|TI=jdo>&1g@Md@T=S9b^6En?llTjXaD^jLnmO3E9fFGBSu2
zr4|?Gmlh?b7VBr`rt61i=INDGlyES%PYw}YAU2Vafj_mPBsH%%Ge56b-z_sIm7Q_&
zWG)eH#%YtyL;@LSP3{m;VVpa8tw;*rQZB}2jLX>>SMV^nF|M2}FM1?#H6sHfBM0MJ
zMh0d^MlKG<^^6QmAc2jH46KZLdU|>sjGMu7j2w(xL2?QljN3sp7YE}`kc5H)2jgx=
z22mtu`Xnal2Pfv_q%v|a?w#x+rp0(*a=w@r<Dtp3#B8NI7#J9s7&{pl7z`PV7#J8-
z85kH?8Q2&Y8M`Kb61&ORJ^74yJY&~n9SK#%ZUzPhAqEx(1_l`h4hC5UUIsY^AqIH{
z21ap439ybL3DtUpDrE)^1{DTg22}<j1~mo-#vaCAkSYcS1|<eY1||ju1}^O_40gL1
zTo@QOFfcGMGJ^E7F)%VPFlaF_F!o_p?}$~s9s>ho9%DWOBNJoSWC=-C#_q{>lJbmQ
zlj9^U7`rD=msFPNXJBC9WnlWpz|Y9eIDwsUk|+ZMLlr|c$W4>4NoFv1PqvpbHUcSA
zW?=o#Ai==S&cMOWI0>Yj5kxaE{9=$|`oqA)_=`b`fdQ08z?zpxX{mvn&d0#az`zj3
zz{wEKAjA;C2r`Np>>Wk}MnkaDFH(t&-IK$l^(8=(iVQ6O8N?XaAoj2`l(92Tnmkup
zoUv>2R_RZS-IG_y*vo+w@-uM!VK8QAoW!Bcq0ONOO4!>Nwu4OE%qshYk+FO7E4lS*
zAeEL30{<DD7`Q-2GHhZ5xtpDF5;B^+UtW>1Yw|<+V8-srrV8?sAZ=U>%piXm{bFEc
zU|{rP^aq(eIaeWuv3v3<1#QOu$=?(}x+D~J7`rFCDk?K}P0mzY%h)|xT*+D#WC9xl
zi=vtWD4v@bn?brarz^R!Fm`WVr&i3!*gsiGqkyq%@??!%#_q|Cn&$E#Jpv4@{}{MH
zLCdJbAp@~{3N-bFYpOAJPp;DhMdCb7Z;%%?)e&yxU{r&s7iJUz*)~~AD~_>ya;KI$
zFUVvu29|#e66}mqC-2n)1?N?*WsKdEYqZ@N`zIgKR@9r$I0K}Mfq_AifdQPR88@OP
zLB?GS42%hki6CW@g>^g_yC=u!C^Pm?ZqSis?3z4J2kayrZE28oJPb^K88kp1`Nbf>
zz`&@?r~=k!pc}y0J-Ja=9vX{G{}@Es8Gf)c&Sd<>pw7U+I2-EQeY!!6-IE3N)ET=b
zTk2Udc26z_vuEpRNP?0U7bw3leq>-}{KUY(Xu@a;HvW!Y1!MQ*P<?C0{>c;dCE2SO
zA*p$zeiUQ(WF7;Ma}5mS7`rC>8z{+w%mF7+CLsoHCSe8vCJ_b(MhiwuuvvWuMvUE)
z4;n}#JjBJ$IEV2U14z|8s5`$Km@sxv)-eRdijSckWB254LuDyY5O6cF{9)i{6#m7)
z%E-XLI3KFvgke5o_hbtrP2mL)5e5e4Z48{CP-05kTw)}^D6x%Ut_WjMb{|WE8IP7W
zixIQY76y}Tj46{7OvLH~LbbGn8B4Y?3T|VJljPXKaCRQUClGyM7Q-toNzQGIW>&mf
zl3d#ujkG|*-XOvcM4a8lSjNDxjiF0RAOIv^Va2Dljj_gzUrUlplwXpMSx=IWMNg7L
zl0}jgWKM$>pOz#qh-EvAp+`$wl9O4_XmYBtkd`DDNVO42xj;ZDNL)*M8$%vz&H@G<
zNlq3$I8SbJf{7$6gPtf4%j8%SNhjY>Eo9Fv|IY(**oB!4LLg7Iuxw+f*v7D8IRih4
z+Xm%=(jgPLD7?mCI(fB8WxWhjJfj9v0;2;{BBM7`GGjDT3S%-;Dq|*78e=0<I%79e
z2IEAgOvcqrS&ZA5vKh}a<uKl5%4Ph?l*c5(RKO&~RLEq+RLo@0RKeuLRLSJURK*m@
zRKt|YR0l4jk{I~@F?g{vY+`5l!T66sgq?9FD24uE;AQ;9Aor`Df%OlAAUoqE`Tq=U
z47`w%1*8<B4qCP_c(60h0Tp2k){G1c{}@hyxQufcWq&a6Fo|(9Ff%R$*ENe67c($0
z*fDT1E@5C~Tm>fAfXQ`Was!y$1SYqDN#$)|Y6qCy1t#|}f@*p$21dsHj0YJHGe`me
Db7Z_q

delta 1947
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
Ds`I^P

diff --git a/S1.02/Jeu/ressources/Lab/Salle0 b/S1.02/Jeu/ressources/Lab/Salle0
index 6a0f07b..353cde8 100644
--- a/S1.02/Jeu/ressources/Lab/Salle0
+++ b/S1.02/Jeu/ressources/Lab/Salle0
@@ -1,6 +1,6 @@
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 @......................................................................@
-@...................................M..................................@
+@......................................................................@
 @......................................................................@
 @......................................................................@
 @......................................................................@
diff --git a/S1.02/Jeu/ressources/Lab/Salle2 b/S1.02/Jeu/ressources/Lab/Salle2
index 96d005d..b0bb381 100644
--- a/S1.02/Jeu/ressources/Lab/Salle2
+++ b/S1.02/Jeu/ressources/Lab/Salle2
@@ -7,7 +7,7 @@
 @......................................................................@
 @......................................................................@
 @S....................................................................S@
-@S..................................M.................................S@
+@S....................................................................S@
 @......................................................................@
 @......................................................................@
 @......................................................................@
diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java
index 8758608..effadd1 100644
--- a/S1.02/Jeu/src/Labyrinthe.java
+++ b/S1.02/Jeu/src/Labyrinthe.java
@@ -603,6 +603,7 @@ class Labyrinthe extends Program{
         int[] indiceSalle = new int[]{0,0};
         char[][] salle = genererSalle("ressources/Lab/Salle"+lab[indiceSalle[0]][indiceSalle[1]].numero);
         Question q = newQuestion("Quelle est la capital de la France", "paris");
+        int rando = (int) (random() * 3)+1;
         afficherSalle(lab[1][0].numero);
         salle[length(salle,1)/2][length(salle,2)/2] = 'P';
         afficheStringTab(load("ressources/score.csv"));
@@ -617,9 +618,14 @@ class Labyrinthe extends Program{
             if(!equals(indiceSalleActu, indiceSalle)){
                 salle = genererSalle("ressources/Lab/Salle"+lab[indiceSalle[0]][indiceSalle[1]].numero);
                 salle[indiceP[0]][indiceP[1]] = 'P';
-            }
-            if(indiceSalle[0] == length(lab)/2 && indiceSalle[1] == length(lab)/2){
-                salle[length(salle, 1)/2][length(salle,2)/2] = 'B';
+                if(indiceSalle[0] == length(lab)/2 && indiceSalle[1] == length(lab)/2){
+                    salle[length(salle, 1)/2][length(salle,2)/2] = 'B';
+                } else {
+                    if (rando == 1){
+                        salle[length(salle, 1)/2][length(salle,2)/2] = 'M';
+                    }
+                    rando = (int) (random() * 3) + 1;
+                }
             }
 
 
-- 
GitLab