From 7bcaa5c9949125621ee07a5ddb3b07a9320ff4a9 Mon Sep 17 00:00:00 2001
From: "michael.divia" <michael.divia@etu.hesge.ch>
Date: Tue, 31 Oct 2023 13:46:39 +0100
Subject: [PATCH] =?UTF-8?q?Gestion=20des=20mains=20&=20T=C3=A2che=201=20-?=
=?UTF-8?q?=20100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/ch/hepia/App.java | 29 ++++-
src/main/java/ch/hepia/Hand.java | 101 ++++++++++++++++++
src/main/java/ch/hepia/JeudeCarte.java | 31 +++++-
src/main/java/ch/hepia/Main.java | 5 -
target/classes/ch/hepia/App.class | Bin 742 -> 1057 bytes
target/classes/ch/hepia/COULEUR.class | Bin 1044 -> 1075 bytes
target/classes/ch/hepia/Carte.class | Bin 2434 -> 2434 bytes
target/classes/ch/hepia/Hand$1.class | Bin 0 -> 1128 bytes
target/classes/ch/hepia/Hand.class | Bin 0 -> 2496 bytes
target/classes/ch/hepia/JeudeCarte.class | Bin 1634 -> 2226 bytes
target/classes/ch/hepia/Main.class | Bin 255 -> 0 bytes
.../compile/default-compile/createdFiles.lst | 2 +
.../compile/default-compile/inputFiles.lst | 1 +
target/test-classes/ch/hepia/CarteTest.class | Bin 1792 -> 0 bytes
14 files changed, 160 insertions(+), 9 deletions(-)
create mode 100644 src/main/java/ch/hepia/Hand.java
delete mode 100644 src/main/java/ch/hepia/Main.java
create mode 100644 target/classes/ch/hepia/Hand$1.class
create mode 100644 target/classes/ch/hepia/Hand.class
delete mode 100644 target/classes/ch/hepia/Main.class
delete mode 100644 target/test-classes/ch/hepia/CarteTest.class
diff --git a/src/main/java/ch/hepia/App.java b/src/main/java/ch/hepia/App.java
index 53f16a6..a1663d9 100644
--- a/src/main/java/ch/hepia/App.java
+++ b/src/main/java/ch/hepia/App.java
@@ -5,10 +5,33 @@ public class App {
public static void main(String[] args) {
JeudeCarte jeuDeCartesStandard = new JeudeCarte(32);
- jeuDeCartesStandard.afficherPaquet();
+
+ System.out.println("Paquet Originel:");
+
+ jeuDeCartesStandard.ShowPaquet();
+
jeuDeCartesStandard.shuffle();
- System.out.println("----------------------------------------");
- jeuDeCartesStandard.afficherPaquet();
+
+ System.out.println("Paquet Mélangée:");
+
+ jeuDeCartesStandard.ShowPaquet();
+
+ Hand main1 = new Hand(jeuDeCartesStandard, 10);
+
+ Hand main2 = new Hand(jeuDeCartesStandard, 10);
+
+ System.out.println("Main 1 avec 10 pioches:");
+
+ main1.ShowHand();
+
+ System.out.println("Main 2 avec 10 pioches:");
+
+ main2.ShowHand();
+
+ System.out.println("Paquet après pioche:");
+
+ jeuDeCartesStandard.ShowPaquet();
+
}
}
diff --git a/src/main/java/ch/hepia/Hand.java b/src/main/java/ch/hepia/Hand.java
new file mode 100644
index 0000000..88eaf6d
--- /dev/null
+++ b/src/main/java/ch/hepia/Hand.java
@@ -0,0 +1,101 @@
+package ch.hepia;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class Hand {
+
+ private List<Carte> Hand;
+
+ public Hand(Carte... cartes) {
+
+ Hand = new ArrayList<>();
+
+ for (Carte carte : cartes) {
+
+ Hand.add(carte);
+
+ }
+ }
+
+ public Hand(JeudeCarte game, int nb) {
+
+ Hand = new ArrayList<>();
+
+ this.DrawCardFromGame(game, nb);
+ }
+
+ public void AddCardToHand(Carte... cartes) {
+
+ for (Carte carte : cartes) {
+
+ this.Hand.add(carte);
+
+ }
+ }
+
+ public void RemoveCardFromHand(Carte... cartes) {
+
+ for (Carte carte : cartes) {
+
+ this.Hand.remove(carte);
+
+ }
+ }
+
+ public void DrawCardFromGame(JeudeCarte game) {
+
+ this.AddCardToHand(game.GetTopCarteOfGame());
+
+ game.RemoveCarteFromGame(game.GetTopCarteOfGame());
+
+ }
+
+ public void DrawCardFromGame(JeudeCarte game, int nb) {
+
+ for (int x = 0; x < nb; x++) {
+ this.DrawCardFromGame(game);
+ }
+
+ }
+
+ public void SortHand() {
+
+ Collections.sort(Hand, new Comparator<Carte>() {
+
+ public int compare(Carte carte1, Carte carte2) {
+
+ int comparaisonCouleur = carte1.getCouleur().compareTo(carte2.getCouleur());
+
+ if (comparaisonCouleur == 0) {
+
+ return Integer.compare(carte1.getRang(), carte2.getRang());
+
+ } else {
+
+ return comparaisonCouleur;
+ }
+ }
+
+ });
+
+ }
+
+ public void ShowHand() {
+
+ this.SortHand();
+
+ System.out.println("-------- Main --------");
+
+ for (Carte carte : Hand) {
+
+ System.out.println(carte.getNomComplet());
+
+ }
+
+ System.out.println("----------------------");
+ }
+
+}
diff --git a/src/main/java/ch/hepia/JeudeCarte.java b/src/main/java/ch/hepia/JeudeCarte.java
index 56a6575..4e4161c 100644
--- a/src/main/java/ch/hepia/JeudeCarte.java
+++ b/src/main/java/ch/hepia/JeudeCarte.java
@@ -33,18 +33,47 @@ public class JeudeCarte {
}
+ public Carte GetTopCarteOfGame() {
+
+ return this.jeuDeCartes.get(0);
+
+ }
+
+ public void AddCarteToGame(Carte... cartes) {
+
+ for (Carte carte : cartes) {
+
+ this.jeuDeCartes.add(carte);
+
+ }
+ }
+
+ public void RemoveCarteFromGame(Carte... cartes) {
+
+ for (Carte carte : cartes) {
+
+ this.jeuDeCartes.remove(carte);
+
+ }
+ }
+
public void shuffle() {
Collections.shuffle(jeuDeCartes);
}
- public void afficherPaquet() {
+ public void ShowPaquet() {
+
+ System.out.println("------- Paquet -------");
+
for (Carte carte : jeuDeCartes) {
System.out.println(carte.getNomComplet());
}
+
+ System.out.println("----------------------");
}
}
diff --git a/src/main/java/ch/hepia/Main.java b/src/main/java/ch/hepia/Main.java
deleted file mode 100644
index 81b4bcb..0000000
--- a/src/main/java/ch/hepia/Main.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package ch.hepia;
-
-public class Main {
-
-}
diff --git a/target/classes/ch/hepia/App.class b/target/classes/ch/hepia/App.class
index 8d3b9dbbfdc30b448e950ad51b56e38c84566f9d..702482c8fd70123c6f1b10106e17ec61aef73af2 100644
GIT binary patch
delta 781
zcmaFHx{yQs)W2Q(7#J8F7@W8mm>8JZ8CZB2SQ*$R$}4%XGjK362q$OgXQUQnChB{o
zmZqdSCl-~Yaxt(oaDkL@GcvGfcxr}mGVn6+u`}@VFbFURGBOBcC6*=X=OpH(>jzgB
zm!#%S)?!pp6lP=)2uLg}O)XLIFUm~M%uCI&;$jeG5MyT$=V6dwkepn{C^mT}qf!dU
zd}$sA83r~+2Cm?Y{BnpkkgyyNgFHx>y*Q&ZEiEUNgF%szK?owR;Cpx_$kM|rQ?1w;
zlo=U#;coXx%uC^7P-0L8xmt~pK~iJ#M@G?lPt7n61`S3Aao@zuJOx9A#In?61w#Xc
zg3SEnjMQQ)kQOZ-25pdy93Y2)%;8|rh3PQD(80l=&&VJObx&eJ(cu-vP}8i~84MX2
zc;HTQEGS@SWMFa5Pf48^6hC=4qi;QHZenJhAtM974_p<<LTg3_u#6EXH1bP}l2hF>
zb5a=@I2;QK^guz)pvYjrz{CIoObm>m=wo1HFk)a}&}U#|U}RumVAa~rz_^itfq{v^
zn1O+T4J^paV8Xz_zyoHpGMF-$)iW?Ka59)PSU`0@WME-nVPIfL+|9rqDWI^OfzxLb
z1CNl<HU<&xZ46S{+Zbd)d<7_fH-l27wgA_51{Gff(+{LVeH(*_&Nc>35L;&(gNQDa
ztq0W!by*Dq1A`p{KLZ0Oc`<M@2r+Ooh%xXoNHOp;C@}~!s4)mL7&3@5*f5AQxG+dE
zcrZva1Te@lgfPf6#4so_Brqt0y`%+kHG?IC6$1kU7ehFMHG>TUBZDD>0fQ}r9Rm}C
U4TCC!J%b$sGXo=o12|Y50e>o#QUCw|
delta 512
zcmZ3;@r+ge)W2Q(7#J8F81&g0m>3y&k~8!(QVTK@^&JZe*cn(RiYo~+GO#%3r=)T*
zFf(xSFt9SPP5#Xo&&JLm$jBf(IgwGgo{K?%K^P<>!pOj);i(x05)k8I5NBXxWZ+9o
zOUq2oNG%FTEG$he0ZB>nFi3%<*o!kt)6#NMIT>Ua<k%Tx85sn!63Y_xa}x8?^@A&m
zOHy-r7~~lg7#W!JOG_9TM18>0nfdwwMVWae!6ikhiMiGs0Srov3>vyb0xkv>1~qmD
zRYnG3ET-`=s559xyrncbipjU0D>%QjC^^+FGbfdify1$&Ko6vYL6L!xftdjWm>3vA
z;laSjz|O$HpwGa_z{tSBz^b*Kfny^B0|OHS7Xt$W8(5H;ft!JWfd|ZHW#D1pWnf_7
zWZ+}qhiXn|U}j)qU|^8n%^(mdps<}m$R}QV8-u9!HU^1J4AMf1+ZdEVe1y4D3~USx
z4D1YC3>*x644e!?3|tIS4BQNI3_M`F#31G|XfkLqFfed2h%#t1=zyK53wE0x0EI(R
Ag8%>k
diff --git a/target/classes/ch/hepia/COULEUR.class b/target/classes/ch/hepia/COULEUR.class
index c38a76f38b5f56aec3100849ad749e77c1255bcd..c582fd28bd308c74abcc31d7c543625ab96af75b 100644
GIT binary patch
literal 1075
zcmX^0Z`VEs1_lQPD|QAZMh1c84E>DMg3LsHXa7(i*U%tN21W)J9tKthHbw^4<owjq
zB1Q%wA9PjLAY~jp44fck?8%8mMX8CUATe$p1|E<YYe8mVX(~vBkB5ODB*Iowl$w?U
z782xP5MmH!WMEebbMy&y4Q6Bzj>fcti$Rn@jGaN4he4b{0_2#S{Jc~~1`!QSpRB~P
zME#t^ymWp4q^#8B5^F97DF$hF1{od(Sq3>q20nxW*SykPMh5n>#GKMp|1?GhQw=2D
z&N+$2#nwmy!6ikRdFj^3Hh>HOo3Fsbpva)a$iQZknU`5&$H*XtY!p<dr)C%j11lE;
zBZC4511ARq4+jH3h^NWJpv9mK@-o;Z#f%K18k$%<&B(w8Q^4Y!pOVVR!0(fpm+DuV
zo0M7<l9-f}%E+LG#a>O!@B_tLesW??SYlBoNF!7?OI~7bDo73yMo_miGO(0nWEL|r
za0X|l=Ovbu7Ns&WFl%UrF*0!2B<DbVt%4L>ps=yQwAs#@k%22XzqBYh)h!d`VlL;z
zqLNfSkc|!o42%p?3=9mc4w9f$#=zhp2}(v_numc6O!I?i0Vz-_0jXr*WYA&IW?*E{
zWnf@XVqjzd0j^C90^1lw4lsyrU|?WiWYA+^U|<8wF*9&7$TH|d)tfLdfknB57`1jV
zNFHEd1gU32QE$M&z`z4h#bC%_#K6G71d3}0Ca{f$49pD73=9nHTG}$(8RR#DrID>e
zXlG|I205L<1gyqXfD07sP=}Z@uz=jnAj`g&fiaSK69aQ_B+DiS_TWg?O$=PYk!+h7
zc!NQ1L-h*>gBgP<)QDuL5!SmI7$b$0nYS~jY-V5vb5vQt9Ck2AjTOw{0&~>az#QHk
v3>upm1VFBbSRls0%D}+D!obVG${@wS#-Pr?&S1j8%)kV7y*Yyg*cX-n^pnST
literal 1044
zcmX^0Z`VEs1_lQPGj;|hMh1c84E>DMg3LsHXa7(i*U%t#1{OvJzO2NuME#t^ymWon
zywY4o2G->K)Y2kG1|c7G_126G?8%8mMX8CUj0~&=nT4gPj0|igMX6~ysf-NVu707u
zDq)U3p{~J<48qaav~$=b=Vaz(me?^eFl%UrF*2|?=clA{FtBnlFfs`8FbFXSGcvH*
zK$VDT_#hk?TvC*omu~H;8OF)L$RNtYz{<eJ!N3mUNboSQgE$-@jx-Mg2Z+N7;>htZ
za5AugSPDE0TnyZd4E#Qsd8vM-xk;%-A&E&KcMJLCCnx5FB^G6Z_+UXU24)69Mh2FW
zjLc$22DY-qoYK@{Mg~z0O)S3RV$fjFVrS4~WDr1dZDnyuYAz3hHiHf$17~7UQDS9s
zenBN8gBG%%{FAa$lS`~Uk-P~L@&ttrJJ@FbG)4wBWNpx((8LU3ki!jl7<3s785vBG
zwK(S_78hG1*#kEN;bu_uTQf3n1?QI*C8xS&f&z!jIkBiDRS%?yk%2QfGd(Y{q_ilN
zkwFE?ERaSUOvl(+I~Xu9GB7hRFt9pEg5ryT!9fxfRbZNffelP^f@lFLQ1mb`Ft9Li
zFz_(&GB7gmF)%Q+Ft9LyK*(+e#z-N4=Ismun;AsF95EI!M;y$NWCe4iz#JJiFh`bs
zF9TyF^Ckw7;7FED4C29&teY65f+N{BF~|mQW{}^=z`(%7pvb_$AjZH7wwafKl|hPu
zjX|A(oxy~GnL!Dx0;EcaK^W>HLk4EBkJz=eWwtXYBMf0<U}Ru`YT^O2*%?$oUSr^7
zP-ReqYBytG1#1`E#2_E(&8)RA(gx&8UuNkY4C*=?z!rj>1Tl>f?gUN-T?Rd<8CncX
eVDq_z7`1jV=pSHU#I28s!3b=oF@p)1HU$7;|I5Vy
diff --git a/target/classes/ch/hepia/Carte.class b/target/classes/ch/hepia/Carte.class
index 6ee4be2ec9d067b2e556b6378e20b2b2cce9dab0..8a0fd9ccdbb8968ac2f609091731dd205d5eb0d2 100644
GIT binary patch
literal 2434
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
SngLWBGBVUK)G;(LNCE(bLhH@|
delta 1573
zcmZn?ZW1;*^>5cc1_lNPhDLS<CPoIn<P80c)Pl@JedolYl2mpE7Dfhvti-ZJ{hY+S
zbbbG%tkmR^iO1xH85vlL67$j-85lho8CcWui;`0(i!y6+vDswiWtP}6GKfvyz$_x8
z8OF%K;+&t7%EiFUAjreO%OJ$az^tJe#?BxzF+iPBY+{9qi7<l%NJf&8K~%#BVOelV
zQD$DcwPqM610#bp4+AR$8;B*#!@$nKF*$}gkeQu9WpX^D=;Zax5?mlDbsh#z29C-0
zOe)%p4D9KtB|%^(GHYmhGBR+ar<S;Z+{wtmo1R+Ym!IpLUz(FzS~OXXNt~IT!C*2!
zqo|V+BLk~*erjnE2ZISC1G{r#QBi7QDF=fYBLizdW?^Y62ZIG81A9o(;T35)say=o
z3|2f0)(jx~@{3Y3^Ad9=Ut-p*hgblzo`b=Gk%84KKRdOEgTaZBfyuF$gTaN7fzgPA
z!HtoD(U^n5gOP#JgoDA0k%7^agTaT9fzgbE!H<!F(VT-JfRTaGf`cK5k%7^YgCT^G
zfyvN-gCUHOfi)~KC$)rwA%c;C#U(K}m4hLQk%2iVKa-Jx%Wv`@W=RV!21bTB9tJH2
zZ4fJghry0P55!91VbEaE<X}i)WMBaC(|8zk8T5o07#K2m7%~~MCigPAv*m!8xsz`(
z*-jQ`(dOV{C}JpKXDFT=%%aW;k}92C#WI_PpN*k#vM6h9JtG4%0|NsKgAgc|7#J9Y
zKyk#tz`z8G5C#SYDF!YE4hBXBZm<{+n9a+;$H2(I&%nUY!@vyIudKD5K|p3U1E-7t
z?-B;y-3-E!LZaIl#P@4yZ)K3ulG(~2vyp*;ftf)LY$O}lA{GV_hI&2*Q3eSH2?kjP
zNd_ebX$E-)1_lL)nG6aHiVPs240anM0|SFH*mX<{N(>APf(%Um8Tc5O*%=tw8I&0r
z7(fY$mq8Wkv;_>z3@i)`3>tWyCJ1($mh4srHK+q8FJx1$2f0EEq8;uE4Y(^bpsrwG
z&;W-LGuS;s5cjY^-2-)y27@NlLHZ1g3?M(SYHeYV+5iqtP-w7$1+~E*=K-@>8R{WE
zX9OhyEV^aZpy@V5(GAnA!=Q~tvl_Z)b4<<k42+<Z1=StRz{0=;3Vimx4EmAGLWaSS
zEJDV?k*q?d!I5l2=D|MNATMoWurxw=iwms9mO+xi4s5;{n6C^CO-TkW1{(%jaERD3
z=s_)-47Dh_UVsl`l|9HRN03#{Agf%1BiV)AgCjYFJcA<z*o3@;BL&!ne1jteIE4Iz
zBLz5x0)rz3xP*d(BL%pHLW3g(c!a`(BL#ScA|Z~H!Em7qLkNQ_k_)3jF05x@U<hGg
zXNZP6F$V6$Dh3vC9BFH9V~Cx_z@fE`A$|jh(Avh3c$|SlD0w*pkJdJZ)Ljhe3=F#%
zvKbgaVFF3`eBgBL#lX(s!@$E30Jaqp<=P-y85qFnNSuM$na7`<LH|D}v#~QUGBB|-
t=(98EGcYscfg?Vjp@4ybfscWSp^Sl%p&U$BGE_4_N`)GRI)(-YNdQE*)lvWe
diff --git a/target/classes/ch/hepia/Hand$1.class b/target/classes/ch/hepia/Hand$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..7f5a3d911ba36617faafa35f851ab6311d560287
GIT binary patch
literal 1128
zcmX^0Z`VEs1_lQP2X+P~Mh5=m4E>DMg3LsHkHowb6+?Cg7Dfhvti-ZJ{hY+SbbbG%
ztkmQZb_O;^1`)7mX-Q^|zH@$VL1Iy2Nq!L{16xT(X0eI^BLlw=idoi-3~V-;d6^}4
zj0{2=XmXlij0`N!`6;QK42%rCJPhm%99#^{4E#I{oD2et49prJ1^hmld8vM-xk;%-
zA&E&jsf-LlKKaRsIbn%KnIJw?kOkxbMg~DtD^v`v85!7<!46GjWKc$OfpcO}NvbtM
zIfSq2$;BYSAjQrg$;iM5_X${zhe4V_hLM3QJ+;I+zceScw1|;GL_-tF1piPU*U%tq
zE(SRU1$G8`Mg{?d2@p9R21N!XMg~r(i$d}l8H6=_z(EQQXxF^bTx*CMRCpLv8PpgV
z*wa%>f)ex6!QtV_#h}5U#m=C~$RLQ&<(XHKnx0z3!yw9_&B(y2;pwUA$;iN#4Dz8N
zBZB~v6G1|tI04HUF)|22T#}esoSz5x6{9C318;CiVsf@`VgWRK)sdYENe|XY4u^_>
zoX*H#0&<BMBLi1(erZv1s#_)~);K{)OAq8|Mh4E{%=Em(lG377Mg}WPQy?N}Y0L)Q
z7k1W+4E(Nn$vOGOnR)5HsU;ctDeMf^j10W+PzPDb!(a<aOdP@aMI|6UBLk0TUS4XE
zb53G$acVIm1BYK~afwHMaS4M010w@710w?~1EYWdC^a%LFfcPPFmN((F)%W4GcYii
zFfcJNF)%Q2X=!g|;L+O7z_*csfq{uZkb!}Lje(JYfx(GEh=GBD2h8ST5M~fzU|?Wm
z5M>a9no!5U#K6M9z#yl+jX_*z8-w^Z23b4VSq%Kz+ZdE}wlOI0U{GHpy9R7C$W$S)
zYBvTR1`h@S1}_E~20yS3T3~TGs0|DZatt~Qx?o%781xu)8JHM&7=#$~84MVh84Mw=
z`@<l^DB#E-%3uU_i!K8**nhlQ+6NdUbPg~`Y-2D6S&i%=MzD1tPqQ+Zf<0@-U=F4&
f7%UkW7+4sr7;G5qK!L)*2zCGi0|SFSScMe;l2q=y
literal 0
HcmV?d00001
diff --git a/target/classes/ch/hepia/Hand.class b/target/classes/ch/hepia/Hand.class
new file mode 100644
index 0000000000000000000000000000000000000000..80fa43d1bfba60969578d63306fe5fc7df58b3c3
GIT binary patch
literal 2496
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
UfRmy#C^s`OFqAPcfWyKW0M6&!tN;K2
literal 0
HcmV?d00001
diff --git a/target/classes/ch/hepia/JeudeCarte.class b/target/classes/ch/hepia/JeudeCarte.class
index 89558dd3cdc5c06109e8aa37fbdfb5ce8deaedab..61d9930e443646901579b26cc34c9e565e2bf61d 100644
GIT binary patch
literal 2226
zcmX^0Z`VEs1_lR)LM{d-24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00Sb_Nbc24S$G(vr*^eaE7r#7dvc;u0<fb_Qln25tr(b_QM^20jLUMh4;J
z4E>DMg3LsHuhi0%ROiH^l2k?p?yS^O7YL`AkwL%*VHn69Yc2*s1|fC^VIBq%22n-^
z0k|2?{-Hjup+SrcY-Nc#rK!b?45AvE(LU(%*6a-8j0}7TVUVp{3}OtDATLTWGKgtl
z>haVJ<7SXykY#6(<6)3zP+(->Lv<D-19M_Z3dl-`dyzuOS~H51L6AX-he4S^g^__h
zIkBiHHL;YDK?u_xkR@t74C)LTj10`_sU;u-JvA|n1gX>FVbBJ-gsmtwH@_^Ei$Rw`
zkDWoEhrxiskdZ+Y;Xdd5oSf9;lFa<PVnzn`;*8R?w478%24M||x!`yL2d!opCxbDA
z2|I%+4}%$lIZA8?R~DC~<}xxc=a+(91<{(BuOCp9nO72AQk0sQYt6x6$;cq43jqoN
ziG`)9B?=IpE*FC}gAF@_Ef0eogFP&Xpz3F2U@rifmXinaHpB*SI0ly#W#*+@L*l@Z
zhrx-#nUR4bvm~`Bu_V6;6l2gJ0(-?1DsIiq;L6~}&fw0&;KAU@$RLCW5ttH22KJ1^
zV!zai5^(B`0_pJPVenz_Wn^H<0}G32K+Oib1d`^hLCM9RharF=kdc8mJ+;IyKi4@w
zw;%@;VW=9QPUm0<MuZGBL|_yn17~n%dR}5lX;CU8gA&BwV4r{@#Re&nfKsZpoi!r^
zi-xCW7$XCVbAC!HBLlxrW?rgaX>L+#QAlDEC~Ad#@{<#D!V-%zL42qnOHpE8IwJ$4
zCnyc(m*%9F7BMm~RxmQKlw@Rratp#HM0T`hWMIlmVr1YAE=f$z_Dw7R8^+F%%*Y^&
zC2uh@2)d`1gya{1^Rj=Mdtz=XBZH8JCc<p6j5Q+zpJPf2m>rT2Q6-{*Y#`XLAWyO;
zgP5R#05!{6GcvG&rHUCD1Tl27Gh{O|2nT_42G|z2qWoNlJzT*V`Q?zr$;iMJoL^d$
zoa&Yd3O0U(zx6<gg+Y;ln}Laefq{{M2~=V+FfxQNFfcGNgfg%(Ffy<*gfTEOgflQO
zYA~=eurn|))M;&JVAR^pz#h4sfpaSZ*A4~&U!8q+%w{a2EV7Fj%ymRrjI3B$%-BTP
zq}g*=5*9JYX>DQP+RY#qDak6zww*y@CxbK-LwE}t<MRLaT38sD|34|sUNDnEo!M4K
zn!Nx?{U!!QW`ues#^wJXZe(C!U}lJ5U|=v};9+23;AUW9;AP-v;Ac=}5M(f75N2>^
z5M=OW;AaSCkYtEtkY-3?kYy-mkY=c5P-2K=U|=v|U}ex?P-Tc>h-P48P-W0yh+$A+
zU}cDAP-2K>hz5s69YY*LJOc>SF(fcVGcYnFGB7ZxF|hq-kYr$GXW(XJXGmgXWMKHq
zz{k!Y$oP{%<p%@n9|m^DUkr*2j0`CZsgO`(uwY<fU}Rum-~)vL^G*g;CWZqHVjI9A
z4Dtmij6o)YT*d=Y3AMYCA&ns&YDx<O69XFq1B1FYa!^Y{f*NG9Br7yfLBaVH5lBJ|
zEDQ_`It(HVdJGB-It*$IhTuR@U|?ntVc=oNV8~=(1sM#rlz~B=A&Vg!>S106rhg0^
z><l@Kj6WD;85$XKNpq1VD4Mal$do~Z!JI*X!IVLb!HRqrF)|o{Q)xH@1A`d@BRKpx
zK;f~2K?f8FOyHCPs@@qG>=@V?9KcpV!kGi=Wk!ZPxEWJG4FLuQ2J1}>MnV?b7_2~M
z?PPFZWbo16$>74sFq1(_dnbbzBPbGmH!&FLY-8}-#$dJl|6`Djplu9RAZsBBR0<qr
zE({zDZVajn9t`>nUJOPIJ`7e2zF=pFF)%TxGH`+80F(i(p$-BiHEsr`KcE(X>n{d*
M21bT_aC#{K004Z`#Q*>R
delta 1135
zcmdla_=v~y)W2Q(7#J8F7~<F&m>3y^lQZ-)QVTK@^}SL{Q&OE1i%L@28CVz@1hNv#
z67_Qu^V0SGld@8iOD0w+PR?OA)?l;A%*!mXV`N~_@YD=rWMFa5Pf6usU}oUuVc=xo
zV`N~~&<tZ|5SVBqq07&}%gMmVAk4$S%D~3OAj%-l&LGCfAON@2*+10BH8hBaL4rYY
z;%;RbX+{P<ge1r@TnthSvLKV?CjOF^QD9JFXHaBh-~+p^v?Mb}-zT%Ugoi<yL1nTb
zqXLI0gBlNmI)ldKNJja|tC_VXzhhPoV)SHWU{B63%}FgSVq{<`O3X`VWMHgdWZ(@h
zNlec6O)LmWOv*`RXE0%85RUdiH~`{0Yeok4;*8R?w478f26F~Wb_R>d2N)&Hco<9>
ztQZ-DHGEKAV+{%xzQnY&%;b#JqJYH0($o@e1_cIN9tJxG`^gKL)D#>UoY@(i7#V~R
zIz3BLixNxni+C7Z7+fbaGRrA&GPpB%vNL#~L`HCBaY<?}4}%wj_hbnsIWAE6`0_CL
zG5Al`WLD?kVhCgiW@iYR9M2@i%EJ)C5IVV(NkzhuA)JRHf+3QTfjuL!*e|uB1RPIM
zlRH^tC%<G-sAptgW?*1oWMBft6aymzI|Bm)69WeWGXo<7Cj%D)BLg=B1EUuMD_Evh
zYdZsv)@}y=$n6Y*TN#9QFo;B2vF<ZtVYXY&U?j;ZYvjvf#<rY6N^1*)&~65)NF7nO
z?F=$I8RVH5!duuFMcJg;b664<{(scM%qT0$vatUDIcfHSnGEX8w#yl$VY)Uks4^q8
zF)_+WvllG<|70Tr0|PUICIbV55d#kc0|Pe$3j;3$KLbC55`!Rv27@qz4TB(qCj&o2
z5Q8K`1cNj~EQ2gV5rZ^C4TBPc76Su=2?Hww14Au?HiHfW2-May=rZUrFfu4Hs59s@
zXfQA_s4}Q97%=EDurWk2C@~l^=rJ%c7%?y~crvj6XOLxJV`pGwWME`uXE0`9_|L$_
zzzz~%XAlJoF)}cS{b%4oS0%u}3{u6&z##sMfsKKY!IXgy60-FSW(<rBj0_A693ao{
zU@!xDk_qfdE(RtB1_m_-b_NZw<9Q(JppIu`u!b4J(8Rz5jz(>e89Nzl7#Vz*Gl=W#
zWN=_)IKUv~vx&h?dmDq#HiiJ5oeW`&472_}16jk&pc%}-z#zoH!oa|w%^=R8%b>`h
z&7j3#0JcvIY`-?tK5+&vhA4(;21amb2r@AJXW#{Ui-DcNk%2*&fsr8woOWUXU_8gZ
diff --git a/target/classes/ch/hepia/Main.class b/target/classes/ch/hepia/Main.class
deleted file mode 100644
index 7c82095527ac8940f83aaf2b36662b4b6e481857..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 255
zcmX^0Z`VEs1_lQP0d@u^Mh4#G4E>DMg3LsH-^9#3b_Nzk27#=^vPAuy#JqHU|D>$c
z<Pt^(Hk-`6%o00B24)S-Fh&Lz=lqmZE(T@>P96qU1~x_pexJ;|RKL>Pq|~C2#H5^5
zMg}3D{N%)(u*9NF5FaYYQj(Eb3{s6^sWl@5S8#r5QF5wVCP*tM$R&CpM=&TdFfuSR
zfB+){BgiTSMh12U1_pfw5TAj8Rcku~$3_MQ1||kB1_lN;21W)324)6s1_lNmFq@Tu
Qhk=)Yfq{{M53GtG0CtNo&Hw-a
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 0c59c3c..1e3b697 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,4 +1,6 @@
ch/hepia/App.class
+ch/hepia/Hand.class
ch/hepia/COULEUR.class
ch/hepia/Carte.class
+ch/hepia/Hand$1.class
ch/hepia/JeudeCarte.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 54d2d1f..b494788 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,3 +1,4 @@
/home/padi/Git/java-card-game/src/main/java/ch/hepia/JeudeCarte.java
/home/padi/Git/java-card-game/src/main/java/ch/hepia/Carte.java
/home/padi/Git/java-card-game/src/main/java/ch/hepia/App.java
+/home/padi/Git/java-card-game/src/main/java/ch/hepia/Hand.java
diff --git a/target/test-classes/ch/hepia/CarteTest.class b/target/test-classes/ch/hepia/CarteTest.class
deleted file mode 100644
index 60dcda85d37ead5584d2ad54aaa8affb1935c4b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1792
zcmX^0Z`VEs1_lR)NOlG$Mh2ne4E>DMg3LsH=ft9t)R5HT5_Sd_Mh1bb#Ii*FoW#6z
zegCAa)Z`LI1~!|_yv!0iMh0dL%`ip=7U%qwR4xW)22LIZRt7dk27aH+yi~u^+@#c^
zki?{%R7M6NpZw&+oUp{AOb{O`$WoG#S<J{F;)7|kH6sIGNosM4duoYuerZl>X%QoX
zWKd~dNoH<pSY~l%QckL4US57lVo7FxUNIwsfKPr=x_(w^US^3t$mQ1T3_^?ye5eL<
zGKesUu``G=G6*0f{6l?QLxXr2#2F+Q8Ca9^!Bz<&ISHb`nu|e@K?>wQX+{Py4NQ4Y
z%`lJ>Ssn&C26;vXu5=`qi)d(KYT#l}WKd>jP-0{dK)BtpxHz?_goi<eL6wn#ClSnZ
zEi6sUDQ09)*YH7)3TsReP=v51gJKXADhPjqM64MZxS^pMl$e(e3J)zF25pef*^?8C
zic%9xSs5UJ9po8(9tHyjLq-Pn^wbiN25^LXf*fuPa-s<%1FMFY7sy5)sIhMOMaiik
zbIo}eEI{V6l@z6><)ng4vjT;lH6w#Kw$Ss`41-zC1yXF!!{7k2nj<~61Z*fHgCNun
zzx-Tin&4n?W@KP>2E`djk1G#@8-qI|18;h22|^Jg11R_rAs1Xyl$n=~l)(J*b3vZt
zVDMsOU^D_5<io?@3o-~4iBMTI>vIcoQcE}(0vH+iT@rIs6;e_aoFM@S(jUab5Dd}}
zcL-QHBZDxq55QvaMjQ-bj0~(^`Pr#Oj0{}C`K3k4scxB|Ji`aihk78_Gbl1JGBAT<
zhl7C;l+hR%8Q2*Z81xw!85kKD7+AHoGjMEVU|?Wk;9_84U;_)XF>o_5Fz|rctPDI1
zybKHsj0}7XYz#~c{7_W_3=Cj{f*DvCm>3us#CJ0YMs8vdX5G#p>9dJJSbH0T%nk+x
zgwcFpcW^QAFmN-7fk_4iF^E>E6(AWk26eE@G_YD03bjlUVwt7@JIFQ>1|98f40^3Q
z7>v-Z6JX$F5M+>G5CZ!MVx1(^I$j1I2AFlGSgi|ZU<Er+8e*N90FMCIb_Poy5e6IW
zZ47qUEEHqlXAozQVvs<xP#S6>Kaz!xSS<{K`cDjEp)fPZdqPgy+ZbH1gry7v4}&a&
zD1#i5U7(N!MHdeP7u<6mMA-$7I3Z8%Z4BO6>{4RjVNhleWl$ktmmgNU&=QHJ01wz>
z{@U9Z0<l=8!NAL)$sop{g=CpHG!S`_JQjl0GPFR{gal$J4!iUico_5<L>UZ_?7|j^
J;ov+H0RVisGARH6
--
GitLab