From 2d9604996f2a99587689b06981c4e5aec5de5036 Mon Sep 17 00:00:00 2001
From: Mattheo <mattheocognet@gmail.com>
Date: Thu, 15 Dec 2022 15:04:15 +0100
Subject: [PATCH] main update

---
 lib/__pycache__/File.cpython-36.pyc        | Bin 0 -> 4040 bytes
 lib/__pycache__/Pile.cpython-36.pyc        | Bin 0 -> 3374 bytes
 lib/__pycache__/listeChaine.cpython-36.pyc | Bin 0 -> 3594 bytes
 main.py                                    |  44 ++++++++++++++-------
 util/__pycache__/bataille.cpython-36.pyc   | Bin 0 -> 2531 bytes
 5 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 lib/__pycache__/File.cpython-36.pyc
 create mode 100644 lib/__pycache__/Pile.cpython-36.pyc
 create mode 100644 lib/__pycache__/listeChaine.cpython-36.pyc
 create mode 100644 util/__pycache__/bataille.cpython-36.pyc

diff --git a/lib/__pycache__/File.cpython-36.pyc b/lib/__pycache__/File.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b1fca826d8d618ae49ff08c6e66e68a5d6a2cf7a
GIT binary patch
literal 4040
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

literal 0
HcmV?d00001

diff --git a/lib/__pycache__/Pile.cpython-36.pyc b/lib/__pycache__/Pile.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5e92113115dbf24dd8cf0effd36b19c1e7b2b6a6
GIT binary patch
literal 3374
zcmb_eO>Y}T7@pa+*BjeSnlz{s+Oj=BYN0xa9@+z{LemIZp@3RdNS4rQ>lw<r>$Nkx
z8x_mB;Qk3toO9t9a6rnx*dv_s7kYu`ow3(WYNw&X*38cAJ0H(H?>o=Cw=Z0%{`K3h
zZFh;WzuC;sMtch-`4g33f=8^&Tb#46n6QNXiV1sUwJh{XqKsY{JzJK9^TJYpNNdDe
zW$DOrr!rzA%tFf*m7?VqttH)>9ZBt_@hr3pdv*G*Q#(g{ytAl2VU5}`PQe;HuYD6H
zsoef42xHl%caxum#uiHQH7dzkT(FiUc*{1YZI#S9TV>&h$}84#ge#Wttca?p;pvLH
zxPa%9SQaaIR>ei^yPCV-g^~25B+VLF_+hsn9UXRMoCaywi#@TC#nS6zh}RF4N1ccO
zHrpJd=|@k(wvCchQ9Wlv=EEOY-OAR<qK*!wo~qZ`4~1;*;;1YBWNY6i3tp8H8U1+3
zl!Ixn?{9Xc2!qXb?|CfKW_NS@+ozA8c%OKWcAny8rZ(dw+<X?KK^R4H+K9quo3wJX
z|8ws8ei(<T@4Ez#a58JKI@z~5u`WK%kacjP7Zy&#2Uj1)BHYWQmxNvv7+PeKdiqEW
zu1Z)Qk1`(m2&Sr_o4Xk2)3`c%ZvvTE+ZrN<(6gZRB02=5!-t&0&5%1--RTl<1Z6*n
zWTrr?r9tFQ(C^Dwpi5wK$JkGUsz|+nqV*@3E*9jBjVHJvZx^06kVcHS$v%bU!O@`s
z1crLuu1r0l(dn1y0jrYnelL{G2~fM=>o1_JA|y>z6hm*K8yiocD+r@FOo=kkr9F4;
zvDufnGVwA44PbIRlJQyobIh#wXRxdkOc~o^C`6R7t`Jdn_8FEa(99$1W)j2+aU~3$
zs?j_q-jDym@9ZdZ4DDCvqBOPwB?%}M?arHM2!6m{UMH*%*bnOmR?3Ighzsj78}iHS
zfbZ46M~lv|`<f32)~$Pm6O&XmY!hlc$!$d28=>a=807mNHcIF+GG5|!zRm~JfEy3l
zZPe)A#z9y5eqQzcZck*;C_k_J{$3VDV@t*NMX&Aqik4Hz4@}YJQp;3PNUKX!k;`V#
zkhCbel8O#by@bZPfa8{?e{F5UQ2Z#kwov|W0j}vVYHP*MZexS<YOsenN597q*9B_4
zhQ(4gB0c7UqqYR;n7vSy6@}R@JV|HG*Ni?JWJaR%^^@;R;LpFm+AWk*5|Tw`xqPrb
zbJTNcui#pHt+TaP0|$(cu+aiE6dz5LiISYaGFN_!%W)mkjMf?X9kLSZAot#ZLQgoI
zBgSeK^N3BF-*SRZFH5C?Xk=N{V3-L_9hDTqpQDUftMkF7S=LUAGI^>1dKVo6Izs%X
zaQTS;0=IXpjy=Nt)vb~a2TLEJEUde9gtEES|5d`XkFgzswU;E}Gm@*RVx7wNnu&&^
z?`U2{5|uA^l<FzXOkPT5D)Tb(YW8+|=yKmdNr)#3DwkKGBg>~~nwK4l+(nn3XgW`3
zI5Vb5IJQtGF|{`9sk4&82V(^D90gR?J0*#M_jK~DMjskpyn#=YAR)gP>2EelMkYOM
zuenz@&{}X|NIV~)Bt(~CdT`=^r}7EWOVPNEl8~Dw30NR|(4lq*_N{wE<c#-V)Y~uE
znH2jGtwPJOQ=XkB33UZlMO3N}siLg+uDReE=5C-&b3qxopzJQ8b`)7DC3W#tjx@x-
z%=!JCZ|^qhtrdK2HuWd5`DWMBsgsAEr7`BbpO^b8jMJGcrE`<cQaWGhv^1^EH{%y3
d^W7r>O*~X}Yx&0VhRYp<d{zJJXt^ln|1bZI%I*LF

literal 0
HcmV?d00001

diff --git a/lib/__pycache__/listeChaine.cpython-36.pyc b/lib/__pycache__/listeChaine.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..44e277d5441417034281c703256d9f35e195d6a2
GIT binary patch
literal 3594
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

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index 5f32bdc..ed6d584 100644
--- a/main.py
+++ b/main.py
@@ -15,36 +15,52 @@ if __name__ == "__main__":
 
     #Tant que les joueurs ont des cartes on continue
     #TODO: vérifier avant empilage pour cas où égalité alors que l'un n'a plus de cartes
+    
+
     while not j1.paquet.est_vide() and not j2.paquet.est_vide():
         pile_j1.empiler(j1.tire_carte())
         pile_j2.empiler(j2.tire_carte())
 
         #Comparaison du gagnant du duels de cartes
-        gagne = pile_j1.sommet().compare(pile_j2.sommet())
+        gagne = pile_j2.sommet().compare(pile_j1.sommet())
         print(gagne)
+        print(pile_j1.sommet())
+        print(pile_j2.sommet())
+        
         #si la valeur de self est supérieure à la valeur de other.
-        #TODO: Simplifier 1 et -1 par boucle qui vide les deux piles dans le gagnant
         if gagne == 1:
-            #j1.paquet.enfiler(pile_j1.depiler())
-            #j1.paquet.enfiler(pile_j2.depiler())
+            j = j1
 
         #si la valeur de other est supérieure à la valeur de self.
         elif gagne == -1:
-            #j2.paquet.enfiler(pile_j2.depiler())
-            #j2.paquet.enfiler(pile_j1.depiler())
+            j = j2
+
+        if gagne == 1 or gagne == -1:
+            while not pile_j1.est_vide() and not pile_j2.est_vide():
+                j.paquet.enfiler(pile_j1.depiler())
+                j.paquet.enfiler(pile_j2.depiler())
 
         #si les deux valeurs sont les mêmes, bataille !
         else:
-            pile_j1.empiler(j1.tire_carte())
-            pile_j2.empiler(j2.tire_carte())
-            #for loop in range(2):
-            #    pile_j1.empiler(j1.tire_carte())
-            #    pile_j2.empiler(j2.tire_carte())
+            if not j1.paquet.est_vide() and not j2.paquet.est_vide():
+                pile_j1.empiler(j1.tire_carte())
+                pile_j2.empiler(j2.tire_carte())
+            else:
+                if j1.paquet.est_vide():
+                    print("Le perdant est {}".format(j1.nom))
+                elif j2.paquet.est_vide():
+                    print("Le perdant est {}".format(j2.nom))
+
+        
+        
+
 
     if j1.paquet.est_vide() and j2.paquet.est_vide():
         print("Partie nulle")
     elif j1.paquet.est_vide():
-        print("Le perdant est le joueur 1")
-    else:
-        print("Le perdant est le joueur 2")
+        print("Le perdant est {}".format(j1.nom))
+    elif j2.paquet.est_vide():
+        print("Le perdant est {}".format(j2.nom))
+
+
 
diff --git a/util/__pycache__/bataille.cpython-36.pyc b/util/__pycache__/bataille.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1888dd98d3bf9f2b5d2772705d9a024a80bea71c
GIT binary patch
literal 2531
zcmbVNOLG%P5T2QRN|t0pQ9ytslNV)G85`N;5Cs#fY(b!iAu@*4R;4zwX6&q3t>oDi
z<+$XN_zAh?!j-E0hFtg)slDc;zrZEwp4G#=E}5<FnckW0>F2j=#bW-}<v&_~I)wZ~
zP7MRr8$j`GV1fu5k`DDK#Wf3A$M8%_?hs)J^Enabka-qJmasvxL9#(|gbR`jk|T0E
zq?{jtE>fncqneQjq6C)i?I4tX7$+^<n+yhv4WRgYV3K%L5RVD!8G?DHFg#0`o-HiU
zYkRJ6yqs{oyvTWTA}{8i6R#i&q6l+Ql*ByDC9weapGmFFrb=Z0Z_t|OFgC+x980cb
zPrZ5>%P46^3GYXexA0tEpQ)*Xeh0SVsurI$L)lkV4(9V~*Z5;C@@5#~r$X{o{^|v<
z+~AA2ldM-NOMI)@k?WP!CEn-;>y@=7UW?Z&H_BRFtJ{A=Uu~-BIx1S@i`T0htX8tw
zU*Z*5cj5XazFOrEgTuaD;%im@NXh+BW(pMr=SG@g6i1lI(Hyb@vLdn)uoiCMz!^_&
z0>ul!26RAtGGM?V?hrS+U1q7BIi5OWi_1o8#xmSjs8*rcmqg9O^!m<9M~a}i(&`>W
zGFk4dY(Cg+?C`7nUVRr{_SH%h2P=Ecq#1;voGtoE5Kg7#-fyYv`#}^WzJDIn#wIXA
zZF*eNNnD<6w$OMSI8Pl}1Ytnh;7pr5HPwQkJ2ROmE{q*0WFU0V+*THx&qDVvj55`3
zm6^g&rB*ljRVwXW#xP76iB7Mn<RuW|JTO8F)I?&(#mvU>i58{<2hJF89qWs*NYE%c
zq=H_^)@%qXFo|uyrYjI*BTm#T#9$X1^o}LI5667}GuVrDIOxQJ@y>R69>W<yCHj7v
z_x(;+K;gl<;QNRDW;ot)d|z~1@Y>m|H5&EWF0{;p`fek&9^U<Nx1QRM8ui=v>#6m)
zcEA28HMeR%)KjDJ;BLxlJL(MDb`IHvH?73FP#83YSwxD_d)G0U2_ZZ6FxPY)eX0cq
zrURYY0E({wn*oAg(A-7_LI4aF1kO&)d$NBttqK=D!0OZ?{|gog8A8x~I-c18g8!7M
z-;Z7-M%x6kfNUV=z}zA~|8l|v!y5#?cY$(1d7!xi_ry55l@x?Aq;PWe#7v69PD%ri
zg>#V%*$I3zFxvA2Ye)wSWE<1nUKrRzfYQUCo{+=kCnUNmT#-ZQ0@(V{UBwee*J^Ql
z#KDUZ05%z+bE6zGtUq19StZ*j>LVEJ5mxsI-vI`ih`6cUYXW*Cx^Z>56-HKljO-I+
zpCaSPu&UJO$i4uUS^(Y$Qej3?Ba~5U^t!#&k<mWrRb^LKsOLs|8bf1!gXd)E5vMfp
zOhkXr(%T;E9llk~x{AI6?J-sop{{-|(JQn>&(Z~Y-aIa1hGzgU=`M5?&C;pff&~J=
z2~FsboG{IeqeTD&HY9O%z}g0^%^|^5K$1>Lhv%Lk{u%oK5Qu)3S_W<E8nD!rapFG<
zgjB02IzncCn;BHFRxf4y6`<9({7Q2ofG!R8`tob|GR8(mJi{lieLF5`zoy6VVr&!j
z5i*3Cti!&+m2RmS)6MlIY#?c@gt#pzl>T=k+4s7A_}RSwPl1^H=AQzZicS6(hK^Wj
zMBPqWf>=d?RMOWeFB=(#>5zU4T28s5y+9P%0E)3-vj`o}XQsTHbIkoT=Vw8{oCBg_
zi^CtRJ<ecekHWyKo4`H*r1>P6m|2HY<9|+p9-kTCKimIMa@O&RSzczySA~u5CQ2bW
zmclpNW!JN@A-WyiQl1+Id&}6O%0Nw6b6J04D)lGt)1JCFGep0I0f`Y83bepVyma|L
DI35U_

literal 0
HcmV?d00001