From 25a662563770917b64154ad0ca6c379dbd28b84c Mon Sep 17 00:00:00 2001
From: martins <clement.martins@etu.u-pec.fr>
Date: Mon, 9 May 2022 16:19:50 +0200
Subject: [PATCH] ok

---
 observateurButtonEtText.class | Bin 1955 -> 1955 bytes
 observateurButtonEtText.java  |   2 +-
 observateurSAV.class          | Bin 981 -> 1087 bytes
 observateurSAV.java           |   1 +
 plateau.class                 | Bin 8298 -> 8553 bytes
 plateau.java                  |  32 +++++++++++++++++---------------
 sauvegarde.data               | Bin 12960 -> 39650 bytes
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/observateurButtonEtText.class b/observateurButtonEtText.class
index be01c5cd231db0738c4f0794df17de234c0c3e72..2b87e5cfd0db7d875017576a71d39f4b57614737 100644
GIT binary patch
delta 14
VcmZ3?znFhR2OA^z=1w*#MgSxa1PlNG

delta 14
VcmZ3?znFhR2OA^T=1w*#MgSxU1PcHF

diff --git a/observateurButtonEtText.java b/observateurButtonEtText.java
index e9116bb..ff6aea9 100644
--- a/observateurButtonEtText.java
+++ b/observateurButtonEtText.java
@@ -42,7 +42,7 @@ public class observateurButtonEtText implements ActionListener {
       }
     }
     if(this.fonction==2){
-      if(this.plat.getLigne()!=-1 && this.plat.getLigne()!=-1 && this.plat.getBombe()!=-1){
+      if(this.plat.getLigne()!=-1 && this.plat.getCollonne()!=-1 && this.plat.getBombe()!=-1){
         this.plat.newGame();
       }
     }
diff --git a/observateurSAV.class b/observateurSAV.class
index cf5ac8518a36364d2bc1ff11da95fe85399afd83..ff2136085a615bc727eb41c41375df39d1735334 100644
GIT binary patch
delta 590
zcmZut%PvDv6kX@GdfMBg9(_<0Ev3CwTj~`<A@P_=B!+izHG~qaGV=!}_e+|1BqYpD
zjQoSI5bIomV6yf-d#|<j+V@312A7}S?j8VCuxLVIB!n<VHDoo6nFwH9BByI!gQa1@
z#3Tw5QxZjqQfsa(7GfwXbfQZkf)0glL=~n{7LdmWcEhnx6=qOTh+$S?4rPgXg#{$t
zOR=%yuiH&Wz^porRj1}OPWVXV@|*j1(>^cO&-QB7;`-`|edsI+^yL2Q=eONgQ7MFZ
zgg`rdFmw=JX6RI2WhPe1c?@x4!d)}6qQ^ZlQp>$a>JH}_Dh$?u)qf3ti(gzxG`(&I
z+UO_HhyG9gF8to4<USkmtpV#EfgS4#z8lC}1h3)yc!ac*;W_p37lK(Nb40i^!EO${
zDAIL+6Z%Dl>7M%7;ii4j3-fo76oMEeY49sZmi9V$hzkv_|079LlA&biOOo_5@xpKS
W013btarg%<qqG0Rv&c((CYg6nheII%

delta 539
zcmaixy-or_6ot<W!wx%+3%Cd>EF!uh2r7nH*;(573KSG37AF3*JOrJIi4R~yq7)X|
z+xt4kGb^GoCT5a*XYRe{n=`vFnKym#`u_9`poe_}A2lBtthrEkVclQ@u?w394Qy#N
zHCh_m<D;%<<k7a6M_@4rYmr4xqhqn-%DZT5>{)bC9NmlKtUf>MUk>_L0_viFJs2Iz
zUMIr~1q@P<jzAaE;gU=kvt~b!1;%i6E8}5-wIb4tJ`|Ncbpe$jbpng*agyCSNs`%X
zl^>zT+zB|XNvc^Aa;%iFG@U=0&R1IxP&Y74sR`2Vr0%|s-groaOhBI|LK-a4K#{A2
z2+LfcF&P8|ugviA6z>x#)dc#tqYA%uL`nH?3B4qe)1R-Xxj#isWu|eLyH|^EyvG3`
PW{mzHYjUibFjhYRPJk<K

diff --git a/observateurSAV.java b/observateurSAV.java
index 9ba4195..922ad52 100644
--- a/observateurSAV.java
+++ b/observateurSAV.java
@@ -20,6 +20,7 @@ public class observateurSAV implements MouseListener{
 			plat.save();
 		}
 		if(this.fonction==true){
+			plat= new plateau(plat.getFenetre());
 			plat.menuChoixTypePartie();
 		}
 	}
diff --git a/plateau.class b/plateau.class
index 1c9ac64a2e5f1be80100e2bd31957d27f4b3ca0c..38ece44230da4cea3cf561cfa73ef57e13dc1d3d 100644
GIT binary patch
delta 4091
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

delta 3887
zcmZ`*30Re77JlEm{g<C#xgy(@MRF+x5eEnzBu#M_+`#3gS%hRLf(fXt*V0BKtEs=H
zv@CQgTO7@ypu(lq(z3nAre&JOX`PwMX__>b&iT18>f<~QobP<+yyyM4bIyOi8u|74
z;eE%S*##hvvrSxuod$MA;Y#dQ@vMsHR6MWZ1r;x<c*(#X6DD@5cv&s4m`KN775h}Y
zs^T?M9Q#$guG2SEdsDTyRJ?7%g?G%bsPF3hJ$1jY#y_bzU}6G3FmR)RKdW0d_MwSh
z_(&%oEA|r=e^K$NfxjB~%#XjB=#PUY`r+>eJ~xqtFI0S~;wxqSTD5N!@Qs0g82G2G
zUx<Gh_}0W=e5c}j6^9J`+rSTg{Kpi(Fc#uR75_ExlZg>Htdk=Kel{^mw^WFuN`Fj+
zv$^92PRI!;_v0dElXMA+Zi5~Zlj)UHsJW0~pGw1^-$WTcG8pBjX<`Nr`WY=FErVVB
z>}q1R?xPGJ8;mh=5d$(&iZXUH80%+u6BRgUFwVrKjF$-${7f{MWMTn>5>88n7<>4c
ztSjs^m}2(D<*KBbsKZV_)BM=xXHS{YttMG5-QZcxBV7B*J$8&Im%Z#F&(JP%;h(F|
zxkdXXPj2?N27Al3$&ste8)_;p8(Y4pQnHD#7FE_X6kS$ZwY<1!q#RVvC}*<2^W=pa
zu|fQc%d2YYO9V8bvcbY{u-d}42wS)wD=n;2af6DhagBu)xQ+-cC|_Eh-B4duojt9*
zW?t<gi+$MF!W!IY;ZB}y;T~+Tcn;QC?5ERBGQ|UG>kr$)gQ{gPv!BHQ%(6I8f!Q2n
z@mC7mtnM5IKBSIZ4zgeMrX@Bq&*Hhvw{Wkbnp8Z2b+`M5`5QUdLL-ORV|+aY_iKv<
z8ab4O7S9tR4#NifYTpp|a2Z>DX<Zt5zQqyh8Ob91Gv65hC=D1bOARs-g>Q_-u^eZI
zjil1?oS@_rE!=`ziLSMm)KxB7T3%n-u%vXv40RP-ERl2Ix46yXBu*w`P68E`*HtQN
zip8mVvT4k-ll&vxrC4Xr@hA7>Ai2?#@%mI6P-byDXV~lfg*_WN)8Z_K2xbz|i>n*z
zY8w{SR@Kxg@B;e>|G@6C`YOw_>y}m3%+H=MrM#xHx;Z`Su*)82Wq5u4#*ZIw*H|mM
zdlr{hEEJBq%KGBkit_rZ+M4FUU0f`^Qu+_zmlBef7R{wu;EeL<&L|1tjFJ=1C~4u0
zk}}RH?=NE#h(_Eba;?3#YYuO=cX#a@mb+7n_<ISnOGaNt=9BPm7mc`Cq!usG170MH
zMeg!U_^8wIse(@v<n6E{_*5AwOx}zq;N23TA13QL)^w3~oDu8mz;-};3-r!*sJ$^J
zA*`EhCplX@zr$T3^*|>t=y^P{U<b6nfbPb+2=sqvPks`<)6X(M&XOg_^=HISh4=J;
zYzY`70r#9S0LJO~9Kq+xHA?~MhV0dWx$-=p2Qqu#C)<vL=NL=__wyKrkcZ(qB6w=0
zDY`kY+dvAuB6cP3v%iS#Wo(RGPN4fXu|L~=ve*N0DTb80L!TR0A@;lCGW#oi5BQEs
zH$Dne_=5(1FDs<V3c83(yMq(+O<c9a%!<zyuC?)LhV%-@zCAuCPahyb(7;|qW1r}I
zk%Im5MS2~&LKIxO!Vv@|M0$r4n3ynF2qz~bCY=J&mykx|K(0;bovPej;THLU@O+4F
z_(*&YM-aObmI+CIVs1|*3BYp{v2v0qSu3agk{*d5*CcKc<he<ugB95i#&HZV@Th^u
zoRc3xvfxjk4`^VEia!(?*s3+K4Uap!*`0K+Fw6-~9<2-+$}muH+a*3)*6ZoS$G|P|
z2L33yF7d+AtQ9N$P&tI|dl-6C%(lM^4h?H5crF&{YsKgmjB%frqLWQn+Xh$2oh%ch
z6=Nr5wV_uiFfTB#6}?+9E@eGp#N~Epm1cQbkd)$SYBzYq;8lY+V(^N=rv|0<%xglQ
zEJLOlSuGgfhVX<?Rz@o(7I?CP!c&}~vP7UB@lTq$%EiqmmbCB5y9p!R!%~%I6LJ(H
z|6NjYQgam9p|@djC`CbCgmy{`rmk`e#cK}H4h?F-G);b&(^(qB(sUr76oYw)V?I(i
z1byTik;_6%l#j!74wn!12rOX{mU0xX;b>gXu~^M<xP{|kb0Y3$u~bG09^e#gl}_Hw
zX?TjIc!6cu%jtN7vv5GTKH+S9$vHU03+duqCUXwQp2gWbhnH|5E1XPChj|nw@}hYL
zo(u#s4x{T)Fp^RE?HSe5o>72%tGuNphpDz#q@;vP^?Y)`^L3OvAFg8?Muh^&k=JcQ
zS;*yT#q{D%t)x?%)TtFn)QnK<%vQ`Q@H%QpRbSBSZovgXpUO7O4#m!C#f1fiJKrDg
z4<v^-aj#Ou`#rKkK~%f$Rox8AtXHU;Yeyu3<_1m2z#lpc@&5G?SV_<<@F@DCP%vsh
z&?~QaaSO^7E*3NB3Hl<Y%wSXtE(t~zX9Z1F%<v>VuUaR~l>L}Zk^^dxbaV_>he58!
zG4yCczcy5aVkN073!;P3ZMZa);SEZ{&u_tHPH=Pt+pPmz)rnmY3K|~S%)$sZ9P9wc
zHlcUWkXxz_8V;u?!nw%dl>B$r@7}>#a|);HB+gFCKoioOm#Ed3kiF^~oU%jHUYV8~
zo*^%_Sos~FT#OWvpPP^8>-?15KO{en!TFN<Rg(G(kjjPV%W7n?2E(`*<9IoyaS7(I
z4)a+rCD0)0zYHt695?a`+`+4GAFsiqycR7C<7KYEfiSPb$6Sd|xe5ol8b5Lkqu9t8
z-o#k0WfE_eyuX!wd7J#gvzgC3c^>bQpHz3t@1yndJLVo%@m|((1Fz)$yn#)E*eKd2
zKEwyOg%5IvXnVMs`}qhD@KJur$9PCQhq=`i_Hdia<m0Y5Zg-7lv#X3PuDQI*HIGlb
z7V;UV#)csJgnXl;oIcrVp!4r31M>H@{6;v2;&%Jbm>S5;JUjEO;XffpI_NVUwZ}E`
z$v5N%t@fME&uBwo$X=Tg_<wbHxjfAhX|Zjn6RloK&>5uwol(k9Qn5i(LCR0mrK(E#
ziMmWxUr_9lpgy+eXHa}HH9Dp~XX<CT-JPkeboorFAsw=UlJ(1HW;#{pPVeSUcN+N>
z15P(Mjb7ZH2t8hAM@9|kP@MLBQcku1Qd=P3axCU9NvhqFRL@FMJts-^yd>2N7|It>
z#FwP6?m;PE#$3LFD(*!+_eoN{ire`bHgZ26=IhwTHzcXvl%#q~dgt5titk9@d>23S
SJ$m>)qj^9cqs?jLJAMI9E?Rg1

diff --git a/plateau.java b/plateau.java
index 8bbbc54..06ebae4 100644
--- a/plateau.java
+++ b/plateau.java
@@ -312,13 +312,19 @@ public class plateau{
 		this.fenetre.setVisible(true);
 		//on ajoute son observateur (pour savegarder la partie si on ferme la fenetre)
 		this.fenetre.addWindowListener(new observateurFenetre(this));
+		this.fenetre.setBackground(new Color(0,0,0));
+		JPanel panJeu = new JPanel();
+		JPanel panMenu = new JPanel();
+		panJeu.setBackground(new Color(0,0,0));
+		panMenu.setBackground(new Color(0,0,0));
 		//on met un gestionaires de mise en page grille avec le nombre de ligne+1 (pour le menu en haut) et le nombre de collonne
-		this.fenetre.setLayout(new GridLayout(this.ligne+1,this.collonne));
+		panJeu.setLayout(new GridLayout(this.ligne,this.collonne));
+		panMenu.setLayout(new GridLayout(1, 7));
 		//on met en place le menu du haut et donc toute la première ligne
-		for(int i=0; i<collonne; i++){
+		for(int i=0; i<10; i++){
 			paintMenuJeu menu= new paintMenuJeu(0, score, bombe);
 			//nous mettons des dimensions convenable pour des Case
-			menu.setPreferredSize(new Dimension(100,100));
+			menu.setPreferredSize(new Dimension(50,50));
 			//les 3 premières case serons consacrés au score
 			if(i==0){
 				this.tabScore[0]=menu;
@@ -333,7 +339,7 @@ public class plateau{
 				menu.setChoix(3);
 			}
 			//et la derniere au logo
-			if(i==collonne-1){
+			if(i==9){
 				menu.setChoix(4);
 				this.setLogo(menu);
 				observateurSAV observateur=new observateurSAV(menu, this);
@@ -341,15 +347,17 @@ public class plateau{
 				this.setObservateur(observateur);
 			}
 			//sinon le composant sera juste sobre
-			fenetre.add(menu);
+			panMenu.add(menu);
 		}
 		//on ajoute ensuite toutes les Case a la fenetre
 		for(int i=0; i<ligne; i++){
 			for(int t=0;t<collonne; t++){
-				this.fenetre.add(this.tableau[i][t]);
+				panJeu.add(this.tableau[i][t]);
 				this.tableau[i][t].addMouseListener(new observateurCase(i, t, this.tableau, this));
 			}
 		}
+		this.fenetre.add(panMenu, BorderLayout.NORTH);
+		this.fenetre.add(panJeu, BorderLayout.CENTER);
 		//on ajuste la taille de la fenetre a son contenu
 		this.fenetre.pack();
 	}
@@ -360,6 +368,7 @@ public class plateau{
 		//créons une nouvelle
 		this.fenetre= new JFrame("démineur");
 		this.fenetre.setLocation(0,0);
+		this.fenetre.setSize(1600, 1000);
 		this.fenetre.setVisible(true);
 		this.fenetre.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		//nous utiliserons un gestionnaires avec 27 ligne(de 4 a 30 ligne/collonne) et 3 collonne
@@ -374,14 +383,12 @@ public class plateau{
 		//aligment Central plus estetique
 		texte1.setHorizontalAlignment(JLabel.CENTER);
 		texte2.setHorizontalAlignment(JLabel.CENTER);
-		JTextField nbombe = new JTextField("0");
+		JTextField nbombe = new JTextField("????");
 		//nous ajoutons les Case
 		for(int i=0; i<27; i++){
 			//creons les composant
 			paintChoix pinceau = new paintChoix(i, 1);
 			paintChoix pinceau2 = new paintChoix(i, 2);
-			pinceau.setPreferredSize(new Dimension(700,100));
-			pinceau2.setPreferredSize(new Dimension(500, 100));
 			if(i==0){
 				//si c'est la première Case alors ça sera la première pour sa ligne
 				premier=pinceau;
@@ -437,8 +444,6 @@ public class plateau{
 			//enfin nous ajoutons sur la 3ième collonne le 2ième paintChoix
 			this.fenetre.add(pinceau2);
 		}
-		//nous ajustons la fenetre a la taille de son contenue volontairement grand qui poussera sûrment un plein ecran (2700x2100)
-		this.fenetre.pack();
 	}
 	//-----------------------------------------> Fonction pour l'affichage du premier menu (nouvelle partie/reprendrePartie/quitter) <---------------------
 	public void menuChoixTypePartie(){
@@ -446,6 +451,7 @@ public class plateau{
 		this.fenetre.dispose();
 		this.fenetre= new JFrame("démineur");
 		this.fenetre.setLocation(0,0);
+		this.fenetre.setSize(1600, 1000);
 		this.fenetre.setVisible(true);
 		this.fenetre.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		this.fenetre.setLayout(new FlowLayout());
@@ -461,13 +467,9 @@ public class plateau{
 		pan1.add(nouveau);
 		pan2.add(reprende);
 		pan3.add(quitter);
-		pan1.setPreferredSize(new Dimension(800, 800));
-		pan2.setPreferredSize(new Dimension(800, 800));
-		pan3.setPreferredSize(new Dimension(800, 800));
 		this.fenetre.add(pan1);
 		this.fenetre.add(pan2);
 		this.fenetre.add(pan3);
-		this.fenetre.pack();
 		//nous ajustons la fenetre a la taille de son contenue volontairement grand qui poussera sûrment un plein ecran (2000x2000)
 	}
 } 
\ No newline at end of file
diff --git a/sauvegarde.data b/sauvegarde.data
index 30c628410baf89502cc11df3418a854e45ac4cd9..0a4e39c7332f3040f2086694ed5dddefe1623f4f 100644
GIT binary patch
literal 39650
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

delta 835
zcmYk5PiWIn9LJOHb#^_32p(n}W2ezp2U4165)TS(M{iEo&TF-+$Tm&33_J-t>S563
zdl3)P!*(capok)R69f+)JPeN-|6B*X3*!4FdC3Za_xruy`+mOPyyn-N+_0}5o+$Z8
z1w~QLh-Yd~yIr_;^x@;#ziW8);Qpk#`uf}CX0EW;`m*5v(7xlwl%Y=G<#ZL+^uwYm
z&P2bQXpPhyhNUXTMTWt7UsXlL;TUUq8dLG}ii6*VmsA7G#O?)8OpVJNUn>mOj4P_p
zwrNVN1~nTC^XnNT<{r<V;!=y_xZ*~t8UIo#?vRIrgh<{(gJGvE_sB!Jl6fG{#D9D-
z=I>{03Rs0_`jOZK=9W2TxfCMlZj<3NrwCr#!L}(@fx)rVVVJR~Juch$WJ%hF9n(fp
zQU~|yQY;2B=ndH+*!xBz*lp55VrYw}81JZv7`>)s6k0LE!P^$?4r&hC9a`x{F2XPz
z-lA%!;b3K1tjMs)5ws<FSTZqc%R8f(OP%-?2sMl2U!+DixW6J<5g~9Lyy!|)=rXkK
z#FdSDUl=6Rv%6AD?+ue%y18`~<6goKe2(X<bdC_$`{}r5;-oKaU9Ow3T?$RHLYIu_
uMH{<b!l`Yh2YVcU+$>!cPqvc1z&}Vi452TFbisPMy?!qJuPf>2lK&4NsOD<`