From 92712b6b7efcda7d8fb711aa7d0eac8334f895e4 Mon Sep 17 00:00:00 2001 From: marc barbier Date: Sat, 9 Jan 2021 14:39:03 +0100 Subject: [PATCH] supression import inutile et patch refresh --- bin/game/Joueur.class | Bin 10752 -> 11071 bytes .../cards/MoyenAge/Moyen_Age_Etienne.class | Bin 564 -> 564 bytes .../cards/MoyenAge/Moyen_Age_Roland.class | Bin 561 -> 561 bytes bin/game/cards/Mythes/Mythes_Achille.class | Bin 554 -> 554 bytes src/game/Joueur.java | 23 ++++++++++++++++++ .../cards/MoyenAge/Moyen_Age_Etienne.java | 1 - src/game/cards/MoyenAge/Moyen_Age_Roland.java | 1 - src/game/cards/Mythes/Mythes_Achille.java | 1 - 8 files changed, 23 insertions(+), 3 deletions(-) diff --git a/bin/game/Joueur.class b/bin/game/Joueur.class index 5d91c63e67a3f4dc2a9ad0b12333f64463d61079..8251a701c2ee7c731476c5b1a9f40b28d641851c 100644 GIT binary patch delta 3864 zcmbVPX>^p;8GfEGlbOln%VZf6@{vrI$wD&85SAoBSOW;8vI+tMmJVbjfh0gOV5u#^ z1*}WmZc!7f;)1bC6;MYM6>$Nf*kg~?)8({1w3Vv$hwV{omD0ZVn_)ok98ddaa=-U( z&-1+7&DMnn7kQ4Ie*Pr@qj`Lqo!1ubiFn{=g~>_| zRa4WeOR8DpVvxvL6W$cA+Zb){sB4Kvy2H_R-6m@pQa7guit0=bM;?(bFe1_BXf(WP zZ91zt(&Q-CtK;dL2Tw5B#CloMBNxq%^z?*RN8FsOmYc-3Es9Ue^M zbdxjmYG-?oHVKo?$i@!YFw=v{yx7D7&Qg2Lx}te<;>vI|+7Vf=!Mk~hY?5yQ;Nn7c z+AQWGRg_Viu>iMeW|x^<%4KSCMl~;2S7-RLR}d*9h7Z>og-!f{E7h)yfV0(PM1a4U zVL4ZuY-79nC}UdDT9X|%O}Q#gGSaFY(PeTS*Q+_+B6h2-Sp}IbU7Ol_+E;c&T#OPG zYP~mKJ?YJMZZdf#zpD;=@6YcwxfMIb2dmEr=HfL(K(Ebe?uxe0>j-a-bh~(6!l+)% z^cHM4c|E=qxuW5@Ntv7)z0in=aVM) zaIZR^T`}Y-!jy24Ejk3-)@vU;V=~5PReDZk?sF!eKcmo0K^ARu^940MCp73~BIE4F zaCEJkuc+&DinCrf`6}`>g(D_k5(=@Lt61{XNMBEC+Lds?4REx2BHv=MdLw_gr@J=S z8N=s&Sgf{KvxWw1V)PCmcOSO-m>t92!KY#6d=^7!ucV#>0r|ZKCF&z6M!ydaK0ppW#1Q<=USA@(fP&=u0vn+|ufWD-h_Geqj|KTH<+DVl zn&((Wyo?jGYY)R!8{;ssj3D~|^Zr@Air|v{e-{-0Ksr7_EySSznJ-V)6moV#%{i*DIKa7TQt>vWj7$z{2Yz5piiz+r@ILBc;$D@T4u!57Yhg0wzr{V=p$4i`nL%bNrgyGwqgZDTWA9FrVb0JfB zDZN}wi%VE4?Ig%$lGc|?=&xWS!yL<%(!Ey6SF5y+2s^!O=X!QMZHaX zCBeSsJ}lD<9`45i*{&`2k-5%3j5~u&IuSxKtn={^Nf$lRDIT;fk0wUiqHlj}03I3W z+jSbnYsDI=tl;g);2jvk9a7DD??f5z!X(~_sqDvG-h;)w7h&FyHa>`rd3bAIBqn0{ggEB6A;J<1_dLV|Z7(d{aX4Ei~8jmy(?C$ZPLi zn_4h_bCO!KO-NH~PK2b12AfZcbP)Y~`M9FA_lb#qV<#MY<1qHg^?Ia(%)g&cOO#1i zC5%#C_UmeB13n-|J-T3}HYQe{^>d~4Ch&v={-2P^KTBTy1;h9r#(Mcz@$>sw!Vj>D zAFBH*2iLqPl55zl3D{{^W;fRqyU9uWJ|$-e1^s-vkix-lps*!L;m|iw&@0cU@QG0P zRIdL_DEw0>e6A^cAr!t83a5m^zyBu+`ceGW(6W5#VY>aD->k1!=~XRh9(as&_zhEC zUNw%ds=li7-tsvEm=QYjyl8S*j>D+eS^Ap(*)KUCv>f7w{`jB61IP<%R~06mDw8{} zGbm@+50aQ>8h^kwN!5ap4a1P;Z1|92VLQMIp5WT4TKSeljR)j{$ei&6ELbZqx6cK7ggpi0( zhYDi^YK@T?WsE|jQI8g53}(riOO0{bjjIuF4~vqixX6xViCOt4;*2=6lH$}~Ada5< bI&rF!;z%btst#6{`zL;F;2aZ)4F3GTKhhdI delta 3753 zcmbtXYjjlA75=_E&&=F}B*P?`B$G@+o|6m^1cdMw5U_wKR1~c^W=0bT0W$+i(=t9l zt<>j{YEs2#O|__iGK%;h)#8iQ+NJGUwq34LENEA|mR&w-HEQ>{GYJu0%OCwS_uPH= z+56jje|w)ZFPwAb3eRg_KJz?)Q~By1&uov)%~7h|voBOiI3lwyh&6d|CCg0)@hah3 z7frUc#}jT=su|ugXSK;OtWg(w8=ZA*aIs$9=q`IVYKn zwypKDj^j*@XNx-S-CW#i@>I5nN+RABTM|zsqL;?qoS`l^D<{t)JROOJ(XQC(8#_Ba zn8&#$=V@(cM?#AP;kx+7PT4TugV|hYVmTM7!{)e(C1Ua7XfoLu-_RaSh{Bn&N!|s3 zi)X1oZY7tiskzO$%W#VaL7roBCC^pexsA1}h`f%jP0`MdSSYi@%?k)y%lPp+6Bn9z zhpW}W-0Iq>$%{3bLUA#tvpXJ*ZO+6Pk9k1GOvZVMa^=mdXgAqmB|>XjC^9N*O?Gmf z>d33GuP3V1!BHjVqOMIHiH?gq<1SvN9?xrbCQK%|Q60&<$NwXfKgPX8&ZR@?bTOr# z8&#%uk1~0ctQyO%F}W3=OX`x*wefk;b&^nx=30~2Ddtzr*-n(kySvwShlZjIwMDy= z@wwV(tD83xzKld8y=-H&D;W>9hCJBLn@uR*qT2E&x~_3iWf9jb?zkkrJQlG z$)8~bVQ;qtou66STfgmDnNZ!T&`mPllyStVrB{SOpuT36A zk(0@rnUi(OP+7!hoA$=Hmj`5MlufkS7-F>0u##a9|1El+JFFBYUCkwIW(AqjwdwWTb~ z3iWW=nACB2@E!{BK1%TqOFtygfU;rzG7F@(S7t#oB+Vfdi3gv^cFI%h*GrN@X;v+k z#5L__EpZS>mNXxNt2xakk&Gq!zIyLO1}or_ZL2>JWdDX2AHt815WvR>%6lC?9f74j zi^YvfPT(ox(JxUtdaHq`ay4bIX=aAtZU3Jdl&sKg;W! z_zDg}l>{qoGU-%nFr2cDQ1@olwNV?GBe74BVrODMO`h6jZaB@Uy>Qw3VYlld*iICI zt`XL9M_6;f@XnU~oQ4Tfp$6Gz7i*1BM}xlk(}iuCc1>B;2ov1+T_ z#--~0%2lal=lOW{Q(Wn2k>t*B}p#FNE{u*%lcz&8c=*5_TE6t1g z&>jxBn$m2W?Do5R;jqon@=N=%OoVF!&a5GKR=YLe9$;4=CInmq+|Y+`IN%64o6;_J zTl>_jp-5`H;GO`J6H&rb1^W~L71O13i#Q#tCF8p}2m5&%p5=Tz&(kr$Gw>Q0 z%XC= zV*}UnS~-Ys;0AR~)ug6PQeX$(#NE7HR!)40ZeC%Him(9Pj2ERl7NCwlWRW^rH9aNg z+}9YU`*xp59P%71ndzC?G{7xF;Gm;jFR#?8o7o&p^XkcVzr7EhW?}d?+pZDhmU2o_ z6Vg0M@wo~4;xmGSr;oqLuCzqE?(c_37TUUQzRVC>BXb?R z1-ZNxrMz7x=njmLJHRY?&SfvoWFJ=YE=0K#?Ys{gc|Usi0JiW!Y-2xm@L}A?N054m zk76%(3&Z!|B|eGYav%Q4{rEGVkt^2$Vflbnm4%rs4_D=wkVDTS$-G5ZeHb0HDrG~i zoN+=@DSaspTNHNSOxz*vUKCpEnd^u13(R%lh?-ZMZ_^i(m9@b&YqBLTbh zk|v!vz0zrt+V`IrOx4z5eMtEGiZu7@sODke?C&sqA_br39$}I&XBY_g=}Bp!ds>8g^$kre zl-|^uC#qQ|CmZ-zX@?^i#lK0n9mQC_i>b?aOv-s2=kh(Y@qMcjVLf*d8?Ho*&t#i0 zmJK8a=UYd*&C0c08V1Fx1f{P~-wf*6?+B`AIH>2pBPgwTa!?;iP#=l=k0q#2B&h%B zp#CdCeI`MDE`N0bhl}>2keJ1QFrZt{@EuZARMqu$?nKJUhGFvSeLbYm;mze?yUyJ zhIJcC>l|e6ldUoeVdTRwU|?Wk5C#AO9SPq6 delta 43 ucmdnUvXNy&8Y3gyU|?Wk5C#AOfeGUP diff --git a/bin/game/cards/Mythes/Mythes_Achille.class b/bin/game/cards/Mythes/Mythes_Achille.class index 1bbfc42e6580d7614c713b316ad30f83bdf176b1..f9e2a2210c3570bb17d7aab10a553e5d92304f21 100644 GIT binary patch delta 31 kcmZ3*vWjIxJR>9P99 it = board.getIterator(); + while(it.hasNext()) + { + Card c = it.next(); + if(c != null) + { + if(!(c.getHealth() == 0)) + { + updateCardHp(c, adversaire); + updateCardAtk(c, adversaire); + }else { + destroyCard(index+"", adversaire); + } + + } + index++; + } + + } public Deck getDeck() { return deck; diff --git a/src/game/cards/MoyenAge/Moyen_Age_Etienne.java b/src/game/cards/MoyenAge/Moyen_Age_Etienne.java index 1601471..a385180 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Etienne.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Etienne.java @@ -1,6 +1,5 @@ package game.cards.MoyenAge; -import game.cards.Card; import game.cards.SpecialCard.VigilanceCard; public class Moyen_Age_Etienne extends VigilanceCard{ diff --git a/src/game/cards/MoyenAge/Moyen_Age_Roland.java b/src/game/cards/MoyenAge/Moyen_Age_Roland.java index 7e23d45..6162133 100644 --- a/src/game/cards/MoyenAge/Moyen_Age_Roland.java +++ b/src/game/cards/MoyenAge/Moyen_Age_Roland.java @@ -1,6 +1,5 @@ package game.cards.MoyenAge; -import game.cards.Card; import game.cards.SpecialCard.VigilanceCard; public class Moyen_Age_Roland extends VigilanceCard{ diff --git a/src/game/cards/Mythes/Mythes_Achille.java b/src/game/cards/Mythes/Mythes_Achille.java index bc1454d..b153a25 100644 --- a/src/game/cards/Mythes/Mythes_Achille.java +++ b/src/game/cards/Mythes/Mythes_Achille.java @@ -1,6 +1,5 @@ package game.cards.Mythes; -import game.cards.Card; import game.cards.SpecialCard.StrongifyBufCard; public class Mythes_Achille extends StrongifyBufCard{