From e37bc7f1b3b11b3fb1a0643d954af7eb0af60332 Mon Sep 17 00:00:00 2001
From: marc barbier <mmarc471@gmail.com>
Date: Wed, 6 Jan 2021 17:37:49 +0100
Subject: [PATCH] hp des cartes

---
 bin/game/Command.class | Bin 1139 -> 1236 bytes
 bin/game/Joueur.class  | Bin 7930 -> 8077 bytes
 bin/game/Match.class   | Bin 2727 -> 2722 bytes
 src/game/Command.java  |   4 ++++
 src/game/Joueur.java   |   8 ++++++++
 src/game/Match.java    |   2 +-
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/game/Command.class b/bin/game/Command.class
index 3c8877177d740f0623a2af548728b5c8b328600e..5dd74be83f04f0d6d249f893dfdd910619577aa7 100644
GIT binary patch
delta 231
zcmey&afOrX)W2Q(7#JAL8KO3F*)qj*2fK#EJ39us#CrsAFnBXEa2BVQBqtW7WE3zm
z@Pi~BUBVCw{1_Q{fC>^*%3x~PY%=pQOY9gKm^C!R7#Ucc^HWl}7?>G?c^Lc|0w$+2
zr7%itKE;&Cm?6pF$-u_I$iNP?o{7PWL6X4-iSG-PVFGCZ(t$t~`aqfyNV95fX9(H|
i))E3FK?X1|a4>`dNgjv-hA@V3AditD0!T73L;?U6w<vW0

delta 134
zcmcb@`I&?3)W2Q(7#JAL8A3L4*)qwo*<|Krme?^eFl%UrF*2|?=clA{F)%au@-TQZ
zcuii$l)@;snVUJ0(SwnJ2_(e8$lwjsuMeadfi$bub_Sn~Kn4?oACP1N3vw{{1KB(f
R1q=ZUfj}N3Ll9V1FaR_a6g~g|

diff --git a/bin/game/Joueur.class b/bin/game/Joueur.class
index b37a273b858c7bb4c0fa0853df6dfc13549c8d22..2f37e86a16ec1b6409a69917b2369a044c998bd8 100644
GIT binary patch
delta 341
zcmexm+iTBt>ff$?3=9nBj2RobuJf96Fvc-5a2BVQBqtW7WE5~Q+-FSSVN7IL02ED6
zE%8WA%qhv>U`%FY-~lR1Oeuq?+x(DMji0lUft7&`XxOgF0<tcQ){{eJO?{R#*z0a%
z$QNde-Nv8`V(CC>NtSJl@!J@}wZO7TKv572BnzTpvKxWMF*7Iu$uI`d$<t-c>nj;*
z8LJrD8LJuk8EY73GuAOIWvpjd%h<rMld+jW8K}|@;s^#622~&r=p05nMn(okFw2%9
zhJgvhVmJttWoF<7>P!L3vM@L>R57M990qzJ2Pn_W!2E~7l%3)J9|m_uYX&ApA4XrG
n5yA|U4dmn*+a?Fd#dA(z;9{J}Aj>#u@(wv`_B5a_CdPCCorq5|

delta 205
zcmeCR|7FW{>ff$?3=9nBjENh$uJdk|;8Wx0lx1LLU;_$PPj;7eVYHasBWudL5y)p|
zPy&)x41AM$<;-KN8I*xMJBUgK6$Vux52%OHj**dp5zMk>h+$v?u^0{lWtkax8S)ro
zfwC+N4h+_eaSVrn_T&KNc^H`fFqpD4-2cPi!pOkH=)>qcnNeI=NMQp|k_l`n8^}n;
ey2+2_;yF7QxEMPbWEs0Ad&^t1$Ai=`CIA2{#v*$F

diff --git a/bin/game/Match.class b/bin/game/Match.class
index e79f9bed4fd93b9be8f07e4b03939f7223f6b81f..3366620521b0a295b4733da6480e699688b40ee0 100644
GIT binary patch
delta 1182
zcmYjPOHUI~6#k|&(<#FxXz{UVqo7f-Xo%5hq7}sg0#d139|%6Cbj0Gch0YYj_xmj>
z*H?)vH(isM#<*~6;@Yi=Kf;|vJ$I&{$;`dye&;*)eCM27UjBZ${`L2#&j5Dd?VLU>
z`BmF73J!lK%}5)0)c0<%Q$qcSku_Um`K;ZWFPg=I1i4Vm>5$OP(1TtHijx=clIA{_
z>d|&>Jf<UzK883#610rnZe=D+5!cU<z#+a_UacHqNb-an^`B%I#1Nm6*EF8SSq*0-
z1l`*bmN8`(lBVrYZUzG>{!MOPmu4^#BrTH}(h|l9!+CL5th`N0>M+W1fj22DVjajb
z<b+Qh_MBmiF^mgU{*2vW8fhIiiW(fMVbqu~S}h|t(%PRIHHRIB2~6@!%DU@Q43|WV
zp0T@)T)L}hSt9WjhO4+niPHsRlD6g^ukafTHwCU{&7wt$!nn<FN5}|_70j`?kuwB%
zkKw)xPEik?V!<uuA;Tj9)~C%>(Mgi0Gsjn{fvry%o{Em^StFB6oHuN9i@4+&!*c=G
zrVPiiOxGds83xV=)SuE$e$XH5+eMR(K%vz}6uW5`RvY%vOoX+UEFV%>igxUSj2NK}
z@cqFy$QmRK9rOV!iQdJ(`&SL@m!pvnSX;q?5^5u!xnGHvp~oYk3J%T@)Z}{Ws=V1h
zUm_J8E~BQ(poA*cVm(c)9i8Z=UB*tH)b_;x$?dPo_0d~8ier?21N=CS6BOM;@t!5*
z2BFPEl|rPn&fm~Qt4bX4+J0y&&JBFTsS+APB?vvFY`Bb|XPqk}5Z_cm#uK{0oOPL0
zVU<bN|4h1KpaQE5C0>oA6CVmhsN?qou`T~f7+>u8c(sJ}Gzm|5V$q86UxC$9l80*6
zwB<`!=3P3xC~>K02|y_EPC|hP2y2eIAUb%trlm=wXYO#@s_8|K6!=1QZs&UWmzt)&
zLJ7KvFGCX-##<`5IE&gArGm@U6|r9@>=ylZsY4H1Xn8D_Y5HmM8aZApq}`^sc8Ii%
rBmy+9g?ARmOB$I(k7qkxk>zt=S3T5VOhb4c^|UIDM0ibMKD_x0AYuB+

delta 1210
zcmYjQ-ES0C6#vc6?9O(2%R&(ewn7Dhb=PFm#ApI5P`52DWo(7zQ&Des$1-Jhww;fy
z1#}hVOZgBkD%%(yc-iMBW@C7e7ZMU)eC5yZf%rtkb7z)HvUBgbzjN+6zw<kH?`>#p
zFdqMV|4#t#p}AsQS2WcNU2#{rwPq*7F7zr$`T_R>F_if2^?eF5v%G5Mi?yo1zZP1d
zXF$OO!+uPPzZ08ZGZ{Wap90<XhaJ0aN%u6vM>r@3)h$|y;joxg3#pG8KEX+GP2D>1
z8Muzm74$}#ryagzc_qsaC^^Fn%Hl6|uwgNLA<3wVwrijtrx<K`)|{G8MS5_W!I3~_
z-m~4{P{7NlOCB$iZwxL&E$XBkNB3ia!ILyowm)L=ih%%i9if7?bG**;4tHnsQ!{f`
zIbc}Cmx`!s+Z$&X&dN)M?T>S}G8Q_Hr1BNR*Ju!xipLje8=QFSh{V5TI4|*J)e0Tr
z(U0#LE=V5fdC!_RxyvPZiQ#etF4aOW2)(Gi9~gd&x~W(*VNfE^sJqLm+EJQo4A(J9
zJgVGwr%!R;8j^{AVz?>c?in5gjukm1E*Nf$Qu3)%5EH55f%j?FS!lHS*o{53OKUHN
zX;RYqfUE@Rz79o<K*cDb>ydblccAJ}bd1pt*ht}7@g%kR__$ig{*G;J9B86D8=K==
zp#{Ut_O&s!LeLwLx2F@g{QOb2jYBPTbt0%>65FtY<~U3R$7xql5L5b|q5tVlb?7Ew
z;s}mX{Wp=qF&wAc6LdeeM#TetQ-j_c`7?l$r(LBM7Gf4B{=lbA4D>Z2$q=nd3%#*5
z+d|rWyN$V+<%`JWD3aRiM3VJ#B&9gfMzsaa?A)W1IGWCq+~?E9m-sKN%DvFxzk|jQ
zvz}hHM#VqrEy`i>YS-4?^G&=GC#|efTo+pskWAu}WDo<=TA_BOeD$teL(0cU0#NaI
z+H#&65`8@+8~tl(Wf7u~=p+~(5+VgNb8&9J2}9;?L6?A;Yh!5{-8rp|bEKHuzai{9
z`Yw`sS8}vmmCFtKGV~^N^4xmCDR1OQB&UJ6#;PPHex_k6^sL^+FJvX6cb7r3x2U84
Q88WnL0~GKpT~6T6e?j5?E&u=k

diff --git a/src/game/Command.java b/src/game/Command.java
index 8685eac..b62f96c 100644
--- a/src/game/Command.java
+++ b/src/game/Command.java
@@ -28,4 +28,8 @@ public final class Command {
 	public static final String BATTLE = "battlephase";
     public static final String SET_ENEMY_HP = "setenemhp";
 	public static final String SET_HP = "sethp";
+	public static final String SET_CARD_HP = "setcardhp";
+	public static final String SET_ADV_CARD_HP = "setadvcardhp";
+
+
 }
diff --git a/src/game/Joueur.java b/src/game/Joueur.java
index b4de8e6..024045e 100644
--- a/src/game/Joueur.java
+++ b/src/game/Joueur.java
@@ -374,6 +374,14 @@ public class Joueur {
 			// appelle les effet de quand la carte est détruite
 			// NOTE : non implémenter dans les cartes individuelles par manque de temps
 			attackedCard.onCardDestroyed();
+		}else {
+			adversaire.getComs().send(Command.SET_CARD_HP);
+			adversaire.getComs().send(carteCible);
+			adversaire.getComs().send(attackedCard.getHealth());
+			
+			this.getComs().send(Command.SET_ADV_CARD_HP);
+			this.getComs().send(carteCible);
+			this.getComs().send(attackedCard.getHealth());
 		}
 
 	}
diff --git a/src/game/Match.java b/src/game/Match.java
index d89385c..69a48e7 100644
--- a/src/game/Match.java
+++ b/src/game/Match.java
@@ -22,7 +22,7 @@ public class Match extends Thread {
 		joueur1.requestDataEarlyGameData();
 		joueur2.requestDataEarlyGameData();
 		Thread connect = new Thread();
-		connect.run();
+		connect.start();
 		System.out.println("ready");
 		start();
 	}