From b5e186946db6cceebc6e1933d93464536c803ed4 Mon Sep 17 00:00:00 2001
From: HydroFlo <HydroGamer@outlook.fr>
Date: Mon, 18 Dec 2023 11:55:33 +0100
Subject: [PATCH] edit
---
S1.02/Jeu/classes/Labyrinthe.class | Bin 11730 -> 11776 bytes
S1.02/Jeu/ressources/Lab/Salle0 | 19 +++++++++++++++++++
S1.02/Jeu/src/Labyrinthe.java | 16 +++++++++-------
3 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 S1.02/Jeu/ressources/Lab/Salle0
diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class
index 7acca075ce5546f9e073d8fca43f18d640f1553f..a540335e80aea4a15001accef5b818e087c09e41 100644
GIT binary patch
delta 1628
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
PC#&fyG1gA@)a?WS&W=t|
delta 1551
zcmZpOxfDI2fXTpcVv&`Xp`oE62ZID71B;=7p#cYj6o_SLV93EB17R6(Fvx*e1|Ts7
zFbkwZiIIWDzyQQj0kI4X4K{v@7q36dz|O$Pz`)R`wVi=cOMq)D1G|<0*IowRNM<b-
zA^vR)g29n2TC75%U>2(u8&r%<i(N<@EXJ<IAtVWAacBv!2}y&Q0&H3W>_V~-HoKMp
zhmbsk&7md0DWnKtb7~2Qa|tPfI9nN1H!?6VFfvYJU|_If;G6tSLQ&L{ftMkafsY}P
zfuA9lL4cu>L6D(gvVo*EuNVUdgE#{(g9L*RgXH82NlRW?1`Y-}23`hv1|bH8$@?Vr
z8C52~lhkL_m@Fq{$*aS_!Jx~)%b>>~#GpSpMaoCgn1PAGgn@&>l!2eYj6s~ioI#qw
zf<cwRYVt{`eoZ?DHU@hJUIqsSK?X+#Q3fXlc?M?&T?QuxGX^&X2L^WrKL$635C*Tw
zjnc`S0Sv4Rfed^ML6hG~*Qtgva59852rxu22s1=7C@@4Z=rKey*f7K}I59*qcrZjV
z_%Xz9o*-k)Xqn8w!jQrs%aF=o%#g-l!;sDp#E`*|!H~&N$dJX*&XCP8mm!B?8AC3^
zeug}Ts|@)J_ZSKoo-h<{{v+$cm{`id!cfM*%TUfB&QQUi#8Ang$56#!#Zb-Q#!$l$
z#8Ar+%}~dX&QQ-#%+SD4!_dgk!O+Aog`t^YE<+2$N`_X3tqg4p`xx38jxcmEoM-4{
zc*fAh@R6aL;V(lkBPT=O<c0E!0wyxBGfZNTWthz1z%Y@)jbR$&GzJC+ZU&Y=3`~qt
zO1~Ib85kJ;G5lv>WSq#rz_65o1uPOQEq#<>CX=s@G;0n^f)SY1+QOj9I(eRgi;)@w
zCj$e+ECzOl*$h$)a~RYZ<}#Qt%ww=+n9tzKFqgrbVGcte!(y;iA`Gm58Dus~C{Aap
zU(O)Ou!2F2VI_ke!zu;~hSd!23~Lxd7}hexF|1=qWmwOU$FPB+f?*>=8^dOXNenv}
zHZtsF*vGJo;TXeih6@aP816IdWq8A|kKr4`eulpc2N>BH4l)Wb9AcDXIKrsKaFWr5
z;S^&a!)eAyhBJ)G3}+dO7|t=)Gn{AaWVpaM!HMA_<4lH2jEfmAGj3$K%D9)|7UNxp
z+l;Rm?l690xXbv5;T{t=!+j<Rh6hYa3=f$!86GhiF+66nVR*vi#qf+NjN#Sf0+pS*
z?-*DZ-ZQW>d|(h@_{bo|@QFc};R}Nq!#4&?hVKmS3_lnG7=AJYGkjo(WcV{VOf`U)
zfq|Kkk%5hoi9v*sdGcn}cv&_EHb!;^K}Jw^=VZ`i<YLfgWM?pC<YlmA<eRLo)*&m%
zz{V)VAkHYvpvEY|V9Y4W;L0e%;LRw^5XdMo`HEVFqznTOqb!32qa1@8qb!3CqXL5g
zqYQ%?qtfJ5^<qU;1~x_w1`$S021!OO23baJ24zM)23<yd217<Y26IN^$v@ToSj`w%
z8O<mAXml7_Gq5q*G6*r+F-S1lGpH~+Fz7KlGFUM>Gq^F@Gx#vNF$6KXGlVhPGQ==?
zG9)p2O=i_>lk{caVf15=V)SQFVGLj}Wb|V&XY^&TWel0TMAKJ3oPnD$f<b^Wl7WG7
z9s?UBkuldXurY8kFfjQ{7SLL<`GD3&#`=2<<_rvs(F|;iF$_YCu?%vIaSU3Fu?z-`
zF$`vmi40DRNeu3c$qc@XDGZT}sSJsX=?oc+84S6MnG7Y2Squ{yvl(VF<}fT_%w<@|
zn8&b#F`wZCV*$fu#zKb2j71DD8H*X&7)uxh7)u$&7|R&77|R)T87mnr7^@ha8EX<4
z{TOQ*BN^)$QyA+R^BEf$s~8&@TN#@eConcM&Sq?3T*lbSxRJ4qaSvlV<8j6g#!HNy
zjCUEk7+)}UGk#|5Vf@F~%f!jp$0Wko&m_+{fk}&TB9kfOBqj&O$xPmi(<X=LDlryL
IF4ye@0I|e91ONa4
diff --git a/S1.02/Jeu/ressources/Lab/Salle0 b/S1.02/Jeu/ressources/Lab/Salle0
new file mode 100644
index 0000000..d0640db
--- /dev/null
+++ b/S1.02/Jeu/ressources/Lab/Salle0
@@ -0,0 +1,19 @@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@.....................................................................S@
+@..................................P..................................S@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@......................................................................@
+@..................................SS..................................@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
\ No newline at end of file
diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java
index b508aa0..63d2c5d 100644
--- a/S1.02/Jeu/src/Labyrinthe.java
+++ b/S1.02/Jeu/src/Labyrinthe.java
@@ -5,6 +5,7 @@ class Labyrinthe extends Program{
final int NOMBRESALLES = 10;
Salle[] salles = new Salle[]{
+ newSalle(0,"0110"),
newSalle(1,"0101"),
newSalle(2,"1111"),
newSalle(3,"0101"),
@@ -152,7 +153,8 @@ class Labyrinthe extends Program{
Salle[][] genererLab(int nbSalle){ // genere un Layrinthe de nbSalle salle et d'une taille de 72 x 19 par salle !!!! IL FAUT QUE LE nbSalle SOINT IMPAIRE !!!!
Salle[][] lab = new Salle[nbSalle][nbSalle];
- lab[(nbSalle/2)+1][(nbSalle/2)+1] = salles[2];
+ lab[(nbSalle/2)+1][(nbSalle/2)+1] = salles[3];
+ lab[0][0] = salles[0];
for(int i=0;i<length(lab,1);i++){
for(int j=0;j<length(lab,2);j++){
if(lab[i][j]==null){
@@ -360,18 +362,18 @@ class Labyrinthe extends Program{
String pseudo = readString();
Joueur j = newJoueur(pseudo);
println("" + j.pseudo + " / score : " + j.score + " / vie : " + j.vie + " / boss vaincu ? " + j.bossVaincu);
- char[][] salle1 = genererSalle("ressources/Lab/Salle1");
+ char[][] salle = lab[0][0];
Question q = newQuestion("Quelle est la capital de la France", "paris");
- salle1[11][35] = 'P';
+ afficherSalle(lab[1][0].numero);
int[] indiceM = indiceDe('P', salle1);
- salle1[indiceM[0]-1][indiceM[1]] = 'M';
+ salle[indiceM[0]-1][indiceM[1]] = 'M';
afficheStringTab(load("ressources/score.csv"));
while(j.vie > 0 && !j.bossVaincu){
- afficheLab(salle1);
+ afficheLab(salle);
println("" + j.pseudo + " / score : " + j.score + " / vie : " + j.vie + " / boss vaincu ? " + j.bossVaincu);
- int[] indiceP = indiceDe('P', salle1);
+ int[] indiceP = indiceDe('P', salle);
char choix = controleSaisie();
- indiceP = deplacement(salle1, choix, indiceP[0], indiceP[1], j);
+ indiceP = deplacement(salle, choix, indiceP[0], indiceP[1], j);
}
newQuestion("Quel fleuve passe par Paris ?", "seine");
--
GitLab