From a47e2b65fde06af2f7f1b51055d411a359d97a5a Mon Sep 17 00:00:00 2001
From: cldupland <clement.dupland@etu.uca.fr>
Date: Thu, 24 Oct 2019 17:54:09 +0200
Subject: [PATCH] =?UTF-8?q?Amelioration=20de=20plusieurs=20fonctionnalit?=
 =?UTF-8?q?=C3=A9s=20du=20model=20et=20des=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Documentations/Cahier des charges.docx        | Bin 13133 -> 13550 bytes
 TheGameExtreme/TheGameExtreme.csproj          |   8 +-
 TheGameExtreme/model/{ => Card}/Card.cs       |   6 +-
 TheGameExtreme/model/Card/ClassicCard.cs      |  12 +++
 TheGameExtreme/model/Card/EndGameCard.cs      |  12 +++
 TheGameExtreme/model/Card/ThreeCard.cs        |  12 +++
 TheGameExtreme/model/Player.cs                |   2 +-
 TheGameExtreme/model/effect/Effect.cs         |  10 ---
 TheGameExtreme/model/effect/FastEffect.cs     |  10 ---
 TheGameExtreme/model/effect/InfiniteEffect.cs |  10 ---
 TheGameExtreme/model/effect/StopCom.cs        |  10 ---
 .../model/effect/fastEffect/EndGame.cs        |  10 ---
 .../model/effect/fastEffect/GameTurnStop.cs   |  10 ---
 .../model/effect/fastEffect/ThreeCard.cs      |  10 ---
 .../infiniteEffect/CommunicationStop.cs       |  10 ---
 .../effect/infiniteEffect/OneCardDrawable.cs  |  10 ---
 .../model/effect/infiniteEffect/OneStack.cs   |  10 ---
 .../model/effect/infiniteEffect/RetroStop.cs  |  10 ---
 .../model/event/HandCardChangeEventArgs.cs    |   1 +
 .../model/event/PlayerChangedEventArgs.cs     |   1 +
 .../model/event/TopRangeChangedEventArgs.cs   |   2 +
 TheGameExtreme/model/manager/GameManager.cs   |  48 ++++++++--
 .../model/manager/SoloGameManager.cs          |  68 ++++++++++++---
 TheGameExtreme/view/MainPage.xaml             |   9 +-
 TheGameExtreme/view/MainPage.xaml.cs          |  82 +++++++++++++-----
 TheGameExtreme/viewmodel/Main.cs              |  41 +++++++--
 26 files changed, 245 insertions(+), 169 deletions(-)
 rename TheGameExtreme/model/{ => Card}/Card.cs (80%)
 create mode 100644 TheGameExtreme/model/Card/ClassicCard.cs
 create mode 100644 TheGameExtreme/model/Card/EndGameCard.cs
 create mode 100644 TheGameExtreme/model/Card/ThreeCard.cs
 delete mode 100644 TheGameExtreme/model/effect/Effect.cs
 delete mode 100644 TheGameExtreme/model/effect/FastEffect.cs
 delete mode 100644 TheGameExtreme/model/effect/InfiniteEffect.cs
 delete mode 100644 TheGameExtreme/model/effect/StopCom.cs
 delete mode 100644 TheGameExtreme/model/effect/fastEffect/EndGame.cs
 delete mode 100644 TheGameExtreme/model/effect/fastEffect/GameTurnStop.cs
 delete mode 100644 TheGameExtreme/model/effect/fastEffect/ThreeCard.cs
 delete mode 100644 TheGameExtreme/model/effect/infiniteEffect/CommunicationStop.cs
 delete mode 100644 TheGameExtreme/model/effect/infiniteEffect/OneCardDrawable.cs
 delete mode 100644 TheGameExtreme/model/effect/infiniteEffect/OneStack.cs
 delete mode 100644 TheGameExtreme/model/effect/infiniteEffect/RetroStop.cs

diff --git a/Documentations/Cahier des charges.docx b/Documentations/Cahier des charges.docx
index 18a9b6f93c0dce542ee7592f1cb43a3899aca511..925859be845dc551a46028a44e8d9e98a26072ca 100644
GIT binary patch
delta 7591
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

delta 7223
zcmZvB1yEc|w>2Jokl+^FLU0H+xVuXrNPrMzU?5?zFc2hIf(#x!xXa)}(BLp=g6p6`
zf;+t2`+fg?-+S*rRcD<#Yxl0bR#jJ5@9u*)BaYP<xcFDCN*y+j(9n*az|iq%p&&YO
zl5bSoQY4a(@ofChUeB7aVn;f(qLXzvC3wm2d$LQm4iOC`?PVR)wp|(ZY_p;q+tjo2
zh1pCeG-_)T_F3K#|9A!k24-A2K2JQ}yK<n9Cxt~t=Np#n8}o*;f5Y_=+BRBhms*r5
zCn<PCHm1f_ZrE&BdW^U^(M9&|L**{bhsm_jSoHV7yAU45iphp8ZfL(<>ABs3X0B54
zMF6Qk3t=-7Q4<$zTJ@uJlRK&FwMM63p9qb<G1%kYK>{u}A*iL&QMd&tncDLV*Po}h
zUzR#1P6^(9f!0a<tKOlww^xr3V9tjw+K7Q+qN#Q>&s;HM=^~YXEi};y^;Y}jkl(!@
zmyCMMPhgq<G<a06Kh@bM36sC@STXqk!$U*#@Fe0FZ%289C-oo<@Iv5&xnXD%scVeK
z%6AqUeb#<`rJ{s^{Qb>Coh{b0hRj3YF-`68{eEJWCb8pImObf=0-JOH<eSjG`8@e8
zfk!kI^F3UjkHPD36Cuk3sD`eL%OH&n&GqO#*gmaFwcJ?K2aCB-cu<e4GEF#AKCCXR
zQD`Is?7~j2MyzLz;dF(_&-Ws9(VhVeXLRek3a8%Dt5|)n(_<<MxhdJuih7!vdvufA
zmj3;oT6dMGI%9W}Remvcc%E6CnY}0QX8H+f!a1uA7A?yYOgrfyD72FoE2MHF%pjNl
z1MjWYKoe1c%5VQ7g9^qo+E1{T?C!fYagOm~GW-^8j=YBw*)Bp)w#a0k1#B~o7aJZi
z3k#SZRU6NZe)Bz2X0r$Gp2G1T_PEYoFU`4b^7WO@Y)S~Yx3DPClx}$jPjpvFf_@zc
zGI(;RcRcQdIdx3!L*LP<I!TRszG!gi^t-5bv6jnvZ(nw=3;A6;CkX^euMmsr*(M{u
z+kBeID;?cHsmS-FV$$>|=T&9j=e?l?FN;uMZQgGmbn_z9oIpRNgA>Pzn~knT`$Qmm
zGVqsXuVcTFFja5*mF1d+*!p}n0vCk#1|9XK`KaFkC^?z@p>`&<tQFD+BBjksaAS@4
zXqxPXTA$4dZfIjTuBnE9N?Y10btU$0+IV6<Izp*<(t<^snMqlxo_0TD4*)g?13hn$
z`)94oI{hCunAf9zE3t^aPwLvmRDV@B<nDQp)#l^nc~e06B(<w^Hq9SZUvLTP@25$P
zlLNMs&?t_ILWP<+ZZ<_>_~D~3IzL{2<{j~fLH4VrlF9FShD3g-G4G;qj?HI*<?Gfb
zKgaz!&)TOL<+bNSojZjRE>B};BL!R2VgM;oQgV2pug}3h)(d4yHgsFt2~Vp~V><d$
z`9KFdf8s)!PhFLkkfC?7?1a+Xm$+|2q=KnXsQwr@lr`eRbUNEc(|jxqBvWGrSP+B<
zqr>Ult=XISl*hXH1wouH7V_q?eh-8LC@EBy{6()~E%AEEZe>)}v29v%KeLit#Fv6*
zTtPAFo?g(ak?Jl2P)xaCF?*JWJ$5D(<jBR)QPz(mp$l?6RGay|%z8+U6N|A+RHreV
zG_I}$Rqvokjc9chnI8Jkq$M4R^+`@eS`OnaBT2J1NQg_1ZB2)vK)JAjIJ54<a53Hc
z@CtN*BCc-v6M9okuGRP5^Vpcx-w7BLCb$7`grexZVBUE}l(v*pibO1pZOrymw*b{+
zWPZ40fC@2th?tFSKb&H+A1*&w$ST0iKz%d<&5H`B9}XYrqy0V+h8;AFiwGYUY)4b*
zC-eBZf3}~}W>;#SHk4^+f;zTC_Hxb)PM-tP`_ATA%Nr6owpel(e0}kkRKOf@oy;$)
zqJ<ixk7t}WY+EJeR<WL~Hnb9%@0t5!sXm=z*Ij-W1JQL+^Xm-4$21m9w|chk)R|EM
z4Y4Q#@sqU7f59nbscEu{6#B^3>yR*$*t4QW0{j%wKP=3|=3^pP^N~+*CYTC_(jX9{
zt2a5bPr{Ct0l3IJ^BOKL%Jkk@rqi-413;^?oH}Cs-!n=fLz3_6T?^-RxQ9{9%iOs)
zhYlwYB?VjE3t{9C*DH&TWA^g3u|OZFdMdTJV2zM1?SKtD1^2L3+hEUk=6ATInROb0
z@W`s2oM<v`14kz&{YOe3a%V>hXYv;y8yd0L_%7zy0xF|yvzwL1M};l-_a|9pn+q2V
zg^bteY8S@}UcGbIq-BO4g|eY`sdY)Uq5{ibjp%p_EKE{J%7HMvQWEP|=)w!odTLDz
ze^Zr_$|1bb_sQc%3s0Pi+ZCf4<IUl>XlsGOud)33@;olG0>W>qSahG5LF5Dnp1iV_
zy}LUNZWK;=Ig~h5kbmWbWm4JjVAl?AYANPBb@h@Gm~UIxxOG!~D!>~+e&X|X3sKi=
zi(k5SqM%pt$_1BjX^kppU8leVD%HjGv~QnTx{;Vp=Xhs@=!d-<pMjJ64`M<}Cc?8l
z3N;r}<dWMI%3V=qHA|A0Gbb+1pTT|((c-=lK)RYzH7YpSK@bY%INA#H#tQ3~_zA3b
zg%7jwFE{$a+ogQ!9?Hh<sL;?J9x&1LG%>Lrqv4?8qM@NNqXA-hH~4XC$t-c8#o@wm
zFcumbj1Uct^iL4t?rG2O<?#0H8_;X7XFhJOa8oz;c`=fEpv^<)*p@`Hy}37BQrXT_
zGpdPU%@zCn6B+jxTx+a^+I8ZaLn#BhJ&~8I<^3t4h^-|bzk_GK7x(dXOW|DF1*tgW
z=G3PVT<nE*qD1#i$QxKr5fPM(T9CV6WQLRh(SCVV1ew<&e<i1V(GfOA!(Y@nmnum|
z__mpYen;4x9NmVULKUadS#(8BM&w<4B0?pcGEu*duE#bNCzDQsh?c!}R5^RnK%I~G
zm9~(%F`R9Y-#u3+az1_7Vb+5sCi=Nvs64U3wrEBDMejqEINHypfla7??2O0eS%bb$
zmsg{~DrdCeL>*3j0{b{EkmNN`p65ImM)f(%E?a)@Aaax<RW(<N!4c?}8FCpG0?)sE
z2b>t~LwgFibvl+5XFXIoeC~VtSwyM;&i7W6Ak0W}p|TP&3^GyRF%nRFv^yU{c4p~)
zUNmxvk-k}$h-e&f&Vy>$5WlsgeuPPoGciVVl~=r9QZOqhFr;S%RiMA+OSY!RYoJkV
z5ayjm9`3zU#7f?E1QJd3ED64XUW0Th<f>=W69FUxOB(*(OGWaRj=`|sx9}M`19Lti
zA+f?ryjP%u#F!_x+9vqmRO**&t^y@`-NQ0G$tpj@$g!+J^iUlOpSH4}N=@JH2{@Ab
zU_Mi88?@X$Li$6rNhEF@VfqQaGEZgIg+q4ob9^NU#LLc$9HcJxZY(3SMry-)dK{Oy
z{3N-pWZX{sIekUqLM1A=I4+W3RmMrMwdY$86m&4rxpDct<$nk!{FZ_?MZp3MuWVYL
zX5;J^(JK_k--Lcs8g**R(LkTX3J>?Kvw@dJd_a5L)P&}z&)!%$`V-4`<&5sTn@G(a
zw&EKf06d^6p;s-iZR<Cnmw|qQs)gJI+60^MnHG@F27F}NbStD>WCf>hp4?I=5PlW8
z^&q7A1T$Y~yP-pQie%6$Pk<A92Lw^KLYbU9`Y74DZ&3WnS=Slk9Di}-UevwS70fM*
z(VfpRf+{L+sq5KM@HE#{Hw6VFKkid>&xogAx<c*(37kGt53LIOb!bau*_Qs2C|OA3
zi?i6j^QPS`e$27h$7$_tMRN8fL3=UpMc8fwH$o$kEt8#MGue~>r*_S$3C52f=u^12
zzF#df&o`j6jyP(Y;X{0$_U~Hux7`PZrzXhapW5id1D=_Ti`cxa7X!`EHQ8RiKw3o^
zFWA;}uTgqY8O@~xdqZZ1?D(a|==^3q_%#v3`?=@Ok88(YCi|t$Ygcnde0YaBzq8}C
zkz}t0!uz(g&adP~dP+NOzXW2<NpZzq^qXkYR$+wNc9Lrm-Qrmp4v&AGzxX_uDW)hj
zoBFzivTpFq3qVbS`f{CC^Yv1^d4|v2AZOjPFZ%A!rb0VIpD3g_T*fK?c&3UtI)QNL
z7)KIMM+cY@ngUL5yrcTGa4!Nf>4dbiPE$-^K~lvT>I<QLR{_9mc70jo`bi*}vO3h$
zSK`@DEKENj3AKLYn{_`aTJqq&wr2fj8T!9#R!hTCXha<&0|z=(UZ-1tMEOE(f%zC%
zKZ%j2PdjB$gAtlT5s_K*@kiWDvJ8nI+i2%^j|8y-W2!yrEOA{J(`zbg2h#T+P6oG0
z)%{|Wa>C*@_*LwItx-sIRJ_Xo!B<-)la&GGz<@-&FZk;#qcjA>6qj77aNRJ5c=kMP
z?lU_)_KP;T?Xdu;XeEkTqcJBr8uATo?)6?wa*(Ab3QpPEAe>Nd5T)}*)^Z#-KSxgv
zk5)$84{xy+xAOGSqx4axTBD{~50XU@sq3LK;_}i`QzBZCz3j1~FTXx+8ony{RgM)W
z4P#Lb!$#38GIkF@5s2W9^A_GN^XDs0mcUiYB-M!Ci^g^66?|2!P4Wz4X56dJL?~t4
z!RE7SL@nNOc4&#!vcl-zg?w-PgtP3n_VTKdHKy>S_1DopT<}2fEHy;eST-(TjKnIf
zViI(LNfVYhAvUSK1@@50w2DU{6Kpf8o3e*zeEmGrh0ZOjnuOaal7C^}zmiU?vGr?t
zy?{HH=xvSRd=DdKrGWhsCaK$DlEK8MjQ*-sMSzC335E%<QbEnV=AV=GEjK#1V`}Qw
z0X_!|M!IBh&qw~OtS8q+xn?nw)mG!+@d21_cBs(QBR$C<)9oE;+C}a%eLjF<jwoK=
z#ip3y=t_@-YUrr?GkL3`>nc!0qE_FYp4@wGt#kEzCM#)`hGu_$=__`<ezN><esiLp
z+^&&@O&e#=35NPeTA;3u?WIS%uw%{7<@tQ`0HemVb(ZZ~Oud4dOwk)U#cS+C-?h}@
z+dp4GAe>+EVduHUSC*l-(fHA+oXz!2MV8Ka8nt0&j-va`fPM3VaUo-7q>#+ESu!Fu
z(mrff3M<Dfv}ABf`XT3$;aPtk{A#K4jyKt*gOs=$07Zl8DLwDaw~MKF2!Vm=H;a4i
zs|2Am*kB*eySU=Sk$jGw61>xG3<9x-^j_evl?bEDFr+#2$uL6eaAMctZ15gZk|0fx
zrE5ls53Z8>8d)>;yR43lob`QZ-BZ~iEEkz30VtdiuMTl^-W<{6<Z3Z|UjzUO`by3%
zS1mU~1!QJ?bZb$$f$mucmiJEQsJA_^%xuGxA6j0zs!tcwvS_-&qSeO_y&fs<*0bR$
zPaiihh#{Ll-?R->25Z>bH$YEI0*}55kdH)J8h<jAyL!Nv!V#|A$oVeFCt4bNeDw*R
z$ya3LEO;{BO|$*#<oX!}&$Og8!~0sdUGXAmD5WV&l+VPaO)UxOL;cDCGDh{+#RCFv
zQM!a{9KYQT_{=GWZ%_IDJ>Jy>mm!mO>d}Dst0yBx1T~<A^oPdqed8>rI%^Nd3B&3O
zO54_0g+03Ha=|%o$0NtRbHn0r;-#|O?hEJb?KawUgsEcR;q+MFg>%2%{b0Bf*-?rC
zG@_bDZm}0!OgaLNAQ}NX;f;XRut&gL=p$e($@KMzS0a6+g}6GE3Z{?6KHPPX?k_Iv
zyM!`9ZW31d7QbO!f*UylWDm}75Be6fM(>*D>l&FL{<XbcLlq_-6%NU$5Mwb@9$ll+
zkc@W1q8g<-*AbO&;b=x(bsY5|Zs8ZudJ;fk*zmU{MrM=z`(M7G(iXXqkY*n)1FK!Y
z{&U@|rYU7eN1oaVZZJ18dP<NLD42OHq3cWLIoMGclCB}37UiQt@<sDpu6IpcN&3BL
zJR5g8hQ&`L0V|n2$&?_0p(w&7Dt_Z5T|7}XFDBk70k;I{FFNfA^B=$GI_$!sDL9nE
z2%+lK)iC+)*G7g$;}MRfd8FEA%B<;)Lco&EiagSh7k~Xki3KbjC_i(HazBtfzs_!L
zjT_8xU|NVR@li`%LL;;Wm3kF+GHA{!4kkx;WF&$5#QI{~wk(yaI%U46H~cv^`Q;X2
zxvd|aPYuka6X5|@_$VD)96=+n8rFzXW-69Az7Wk(Xv+xmIr^44@s*@F6=_j!gnKv5
znE|D{eqb~`ext$>;{8+}3o1NszOEBB+<36@`*VePx5JqjZ@hPv0@<lS>F;<BBI~wi
zzNJI8eVzH5>;-<CqzvHnqSBc9Lexctrl0z~3&OHmYsTUY<~X#ZstSsH)aWYVBL_){
z4DEHdhS+h~%Qc2HwY0b49ZXLora9U<1#R&ljkS8qN3rhDqmlRWlbym=Se#W#Uu9S&
zW$bOKKG?)_tMjn1?6?)GVGYna`#!8y34fo62=`7oK2A=}ASW$)`ZD<oF^1a?;<Ee%
z&<W~4z8^8L9VH+t6ornSI(*-gm8Q?i{8kc#vLC%*X)Ge#KbW$ZTn(?<qib3%yKa*i
z5~tum;o`Ig(*b9Q=%;P?*@lEx5xYAhUui)jUl|X7`&F!QmrVFF?{HM(B#hV)v3*fs
zkA6PDrRwS%irFB&dqfr<vq74nT!(-bvaooChw1xvbrmnz*g}nf)dB{O2-`~v(dhzT
zYh#Mto~M(kz_Fb=iq~S^UU9YvOa|$HPYe6+ceXPn2)X4)uGQEh5@#g%Q*MG!M16F<
zK*Ri6BlMQ%3X}DDk@>`dfv9+_cyT`BFdglU4zFg*;t@ZP6*t|BqrgCEEAmI$j0I@v
zV?A_a7?>o`L;y($3&^$aG3-lSXlRMcNRFjO?0?%=sWS8tU$c#WH2HmZ_#L_M?4q-|
zX)T@OJe}*86ZJb+l`pe=u}Y*r8NvWKTEy3M^ASq|zy%QErJeZGSU-y{G0u6upYwf0
zL+e?|)g!Sod~S0K)q4}&RLQ^woG!5GZ8<cGN%c1aM0tF$seZOn&ceJQYz1uk*iDW7
zIf0_rCY@hVw&TM2UC(+$Uva;7Xa9iqP6e-co~DiLB}_n*k>kzWxd{X#2;mM%X%pJY
z4&y<}yIV@{JOoYDFX^+<04yXP-SKz1+S6P}pX-Q&lnxQ=DyKSfAf+lTl!$5p8&tdi
z0`g?_<Kz~{$gEh23K}vQV@#>YY13`^@HpF5)P`zB<#dU-iPR}q0n4Ho(;FXzrBU3m
zpjjOEfs*IX#svRQq>G4Jr+AE!)5z(N)ky7#lqdgR{9hR)!G90iZEl35`{Pj<j46cS
z!u6Oj_>5Yu>7N)uonpy(;1_>VE^+@e7$HYM!SdJGM7`kV6g_5aKBIqAd`w?XsCeLg
zcocIte^LTM@wxw{?cbID5~T2dHO`eeVTR)GgB8NgfeK-dnQ|5I{}KoN$Hc$HlJN*!
zko}`y$uz(u1;eT_=5Q71CwT}wgzl8?PQ`A%8ql7ShZ-&NikCgSKikrf!Kna@GtBsX
zWl|c>*E@e)zwYM+b2+4tv%0(u9KVBWz<|FALQ8M1_eBlSWcOU~MoZ|u!vZGB9z%UU
zTE#EHv06vFEBEH%SVJqerW5ro<%d7UhDZetG=z!PWj^|vHh@yQxeo@%i4>oATctJI
z;&L|eGKmw$V!$$%Ett+SiUxLjHRZPP`*2ogw72m!x633M6m3u6rGFXw=?_w{7H`4h
zf=UYd^tI?a0b2C~E5n7lTjs2bK~Rhz({U>s&Ot{IQ6=A2+Pqs!B68M0T+q9EsHZnM
z!jeefzA~K4-Bd9#yKL1U{GBM9jTI4|nJK_BE|VJihi)um9z;%iczygQr1&AF483=G
znq*_&IpWw$v^ZhBG90VCj2Zoxv)XS@(T>YMg%DOm`c{?DhS&OHmY<G2y6GG7T&UM5
zQQ^$bB*Y12N(;j4U)N7P@iEaHGp$F0rwu0G{4sLajQ4(Vn<M9Tr)P!XmrAb8p2}4-
zttnr9^IvZMm}znz*m1V3pZW(--lCNj&R&1Rzb$<#OO~|y7eLFB7b<&=HQoLL7@M9*
z3EuxjWc~#p)AiB<vHt<=MP+{k{R0W}f6A7O{15nFD&Cf9V|D(d(SDV@iM|NQwyJTB
zuUoZ-UqFS`eG5_Ku^4l?OF1eMflHU%oZStwh(g)yUlPL0n~Oe{+&t|gaEv*?OVzS$
zOQGIEPWiKSlj-?}?&*!WT4fj9FZfg~71h^_9IA#84SX3;vdXmwar)bU#nSyQ$<tk3
zQ&@9W$*~vR$<*xnLa3jrd&Oh3aS7RimzGwyMo{)3xA#*r=>x|_?WasX)$`Gj)5w=e
z??1gXi=61=Z%S+|zlB@0$nsoC^T!_S&uv{U(`P3wvuwe2-J-lPdcS0HTbszrZl)d`
z`)`!_KccS-GznGiDi~EpIE?NuK2<E5U+g4mEAMUyOi}&(d3LHfP^>!RW#Nk(5Ek(%
zR;y{C-r|#Llk}_ytyH<{J_rN};iRIPCc>RY_TbTR^^R<+WH~3{j!+RJP}s0()}@W0
zUrga;I4>WP-rvjqe|xW)jdAOxI&yw?bf~ubyZ~VvU<NAi)*Y44#EYT)J<e|1_625-
z8!}ysv&&vRZYF28iphaLt9D-`n=yO4k28S`;@(z4OaeOsec!B0H(r6ef10nDF+AB>
zOE$(!a!EQPHrd0CTpYMK?BTdZBPGg@VzacUk+C!L%sOTCOLBa>x1E1dW2$Dm00l3<
zQ|WH|Stauv72Wb}^>_G+g%f`lTffTp4fF?7_?hI5CUQhDF6%MTX(tcXmFUBp*A;y)
ze@9Y$Qgxu43_*Nj4~*(j*?%(7yuwPt4{T6>R>|cOYS(6}|0bVu@M`0u#qSR!Op4Vi
zy!i)%{3@#10UxK=ZJGx$KBRDesH}lv-_a5=va2WMUb<Q~D7;irTFRSKrZ`uB=@??j
z)?i_7X86dy$Q7d#O1_3}ly#tz=K4Em2-E4bMq~5Q2&A*rok#v)K8nFeWRRI|ve%|V
zj4h^CkXqe8>XBJt(v0QCv(GEiU|bwPC~{FBn_#ErYwN1)@Tg{8$j5PK+oHGT-laz$
zcjqqTC7cDaNklLG{qR4vBj=CGK5p3yUQmVHxampiZaD^8f#kq!4Lu5)teN3Lq-(*I
zByP{-9$FaSMH%gYV;z}TK=R;-^L048Bp8l2shJ>)4kHzs`_BuyGa+3J9}<{~Fem;0
zJ|p}yNB;fHQNkjHS+W1_&0#gd6c~PVuzq0~3<*ZqBM~45-xHXs2nYRt_lIa`fd7~J
g_cxpw7AeAv{rCKWRf$kw*zv)7MObjW1^x>E7i{&@kpKVy

diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index 58ec1ba..7f44d32 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -6,16 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="model\effect\" />
-    <Folder Include="model\effect\fastEffect\" />
-    <Folder Include="model\effect\infiniteEffect\" />
     <Folder Include="model\event\" />
     <Folder Include="viewmodel\" />
     <Folder Include="view\" />
+    <Folder Include="model\card\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="model\effect\StopColm.cs" />
diff --git a/TheGameExtreme/model/Card.cs b/TheGameExtreme/model/Card/Card.cs
similarity index 80%
rename from TheGameExtreme/model/Card.cs
rename to TheGameExtreme/model/Card/Card.cs
index b3c1b83..e4270b3 100644
--- a/TheGameExtreme/model/Card.cs
+++ b/TheGameExtreme/model/Card/Card.cs
@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel;
 
-namespace TheGameExtreme.model
+namespace TheGameExtreme.model.card
 {
-    public class Card : INotifyPropertyChanged
+    public abstract class Card : INotifyPropertyChanged
     {
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -21,7 +21,7 @@ namespace TheGameExtreme.model
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(v));
         }
 
-        public Effect Effect { get; private set; }
+        public static readonly bool activate;
 
 
         public Card(int value)
diff --git a/TheGameExtreme/model/Card/ClassicCard.cs b/TheGameExtreme/model/Card/ClassicCard.cs
new file mode 100644
index 0000000..c490f59
--- /dev/null
+++ b/TheGameExtreme/model/Card/ClassicCard.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace TheGameExtreme.model.card
+{
+    public class ClassicCard : Card
+    {
+        public ClassicCard(int value)
+            : base(value)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/TheGameExtreme/model/Card/EndGameCard.cs b/TheGameExtreme/model/Card/EndGameCard.cs
new file mode 100644
index 0000000..0595bd0
--- /dev/null
+++ b/TheGameExtreme/model/Card/EndGameCard.cs
@@ -0,0 +1,12 @@
+using System;
+namespace TheGameExtreme.model.card
+{
+    public class EndGameCard : Card
+    {
+
+        public EndGameCard(int value)
+            :base(value)
+        {
+        }
+    }
+}
diff --git a/TheGameExtreme/model/Card/ThreeCard.cs b/TheGameExtreme/model/Card/ThreeCard.cs
new file mode 100644
index 0000000..685c010
--- /dev/null
+++ b/TheGameExtreme/model/Card/ThreeCard.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace TheGameExtreme.model.card
+{
+    public class ThreeCard : Card
+    {
+        public ThreeCard(int value)
+            :base(value)
+        {
+        }
+    }
+}
diff --git a/TheGameExtreme/model/Player.cs b/TheGameExtreme/model/Player.cs
index e66f016..ee06ab5 100644
--- a/TheGameExtreme/model/Player.cs
+++ b/TheGameExtreme/model/Player.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using TheGameExtreme.model.effect;
+using TheGameExtreme.model.card;
 using TheGameExtreme.model.@event;
 
 namespace TheGameExtreme.model
diff --git a/TheGameExtreme/model/effect/Effect.cs b/TheGameExtreme/model/effect/Effect.cs
deleted file mode 100644
index d8aa9b6..0000000
--- a/TheGameExtreme/model/effect/Effect.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model
-{
-    public class Effect
-    {
-        public Effect()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/FastEffect.cs b/TheGameExtreme/model/effect/FastEffect.cs
deleted file mode 100644
index 7a6296a..0000000
--- a/TheGameExtreme/model/effect/FastEffect.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class FastEffect : Effect
-    {
-        public FastEffect()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/InfiniteEffect.cs b/TheGameExtreme/model/effect/InfiniteEffect.cs
deleted file mode 100644
index 39bf284..0000000
--- a/TheGameExtreme/model/effect/InfiniteEffect.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class InfiniteEffect : Effect
-    {
-        public InfiniteEffect()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/StopCom.cs b/TheGameExtreme/model/effect/StopCom.cs
deleted file mode 100644
index a6e93dc..0000000
--- a/TheGameExtreme/model/effect/StopCom.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class StopCom
-    {
-        public StopCom()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/fastEffect/EndGame.cs b/TheGameExtreme/model/effect/fastEffect/EndGame.cs
deleted file mode 100644
index 013b47f..0000000
--- a/TheGameExtreme/model/effect/fastEffect/EndGame.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class EndGame : FastEffect
-    {
-        public EndGame()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/fastEffect/GameTurnStop.cs b/TheGameExtreme/model/effect/fastEffect/GameTurnStop.cs
deleted file mode 100644
index d619e6c..0000000
--- a/TheGameExtreme/model/effect/fastEffect/GameTurnStop.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class GameTurnStop : FastEffect
-    {
-        public GameTurnStop()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/fastEffect/ThreeCard.cs b/TheGameExtreme/model/effect/fastEffect/ThreeCard.cs
deleted file mode 100644
index 17676c9..0000000
--- a/TheGameExtreme/model/effect/fastEffect/ThreeCard.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class ThreeCard : FastEffect
-    {
-        public ThreeCard()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/infiniteEffect/CommunicationStop.cs b/TheGameExtreme/model/effect/infiniteEffect/CommunicationStop.cs
deleted file mode 100644
index 232cc12..0000000
--- a/TheGameExtreme/model/effect/infiniteEffect/CommunicationStop.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class CommunicationStop : InfiniteEffect
-    {
-        public CommunicationStop()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/infiniteEffect/OneCardDrawable.cs b/TheGameExtreme/model/effect/infiniteEffect/OneCardDrawable.cs
deleted file mode 100644
index 191a0b8..0000000
--- a/TheGameExtreme/model/effect/infiniteEffect/OneCardDrawable.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class OneCardDrawable : InfiniteEffect
-    {
-        public OneCardDrawable()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/infiniteEffect/OneStack.cs b/TheGameExtreme/model/effect/infiniteEffect/OneStack.cs
deleted file mode 100644
index e320253..0000000
--- a/TheGameExtreme/model/effect/infiniteEffect/OneStack.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class OneStack : InfiniteEffect
-    {
-        public OneStack()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/effect/infiniteEffect/RetroStop.cs b/TheGameExtreme/model/effect/infiniteEffect/RetroStop.cs
deleted file mode 100644
index a6d2a5d..0000000
--- a/TheGameExtreme/model/effect/infiniteEffect/RetroStop.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-namespace TheGameExtreme.model.effect
-{
-    public class RetroStop : InfiniteEffect
-    {
-        public RetroStop()
-        {
-        }
-    }
-}
diff --git a/TheGameExtreme/model/event/HandCardChangeEventArgs.cs b/TheGameExtreme/model/event/HandCardChangeEventArgs.cs
index d4eb0e3..1961739 100644
--- a/TheGameExtreme/model/event/HandCardChangeEventArgs.cs
+++ b/TheGameExtreme/model/event/HandCardChangeEventArgs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TheGameExtreme.model.card;
 
 namespace TheGameExtreme.model.@event
 {
diff --git a/TheGameExtreme/model/event/PlayerChangedEventArgs.cs b/TheGameExtreme/model/event/PlayerChangedEventArgs.cs
index 161e1a0..4e9095f 100644
--- a/TheGameExtreme/model/event/PlayerChangedEventArgs.cs
+++ b/TheGameExtreme/model/event/PlayerChangedEventArgs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TheGameExtreme.model.card;
 
 namespace TheGameExtreme.model.@event
 {
diff --git a/TheGameExtreme/model/event/TopRangeChangedEventArgs.cs b/TheGameExtreme/model/event/TopRangeChangedEventArgs.cs
index 0698b3b..59f2e35 100644
--- a/TheGameExtreme/model/event/TopRangeChangedEventArgs.cs
+++ b/TheGameExtreme/model/event/TopRangeChangedEventArgs.cs
@@ -1,4 +1,6 @@
 using System;
+using TheGameExtreme.model.card;
+
 namespace TheGameExtreme.model.@event
 {
     public class TopRangeChangedEventArgs : EventArgs
diff --git a/TheGameExtreme/model/manager/GameManager.cs b/TheGameExtreme/model/manager/GameManager.cs
index 0d48137..204c286 100644
--- a/TheGameExtreme/model/manager/GameManager.cs
+++ b/TheGameExtreme/model/manager/GameManager.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using TheGameExtreme.model.effect;
+using TheGameExtreme.model.card;
 using TheGameExtreme.model.@event;
 
 namespace TheGameExtreme.model.manager
@@ -12,13 +12,15 @@ namespace TheGameExtreme.model.manager
         protected int nbMaxCard;
         protected int currentIndexPlayer;
         protected List<Player> playerList = new List<Player>();
-        protected List<InfiniteEffect> infiniteEffectsConstraintsList = new List<InfiniteEffect>();
         public List<Stack<Card>> ListOrderedStacks { get; set; }
         protected List<Card> deck = new List<Card>();
         protected bool win = true;
+        public String EndMessage { get; set; }
         public event EventHandler<TopRangeChangedEventArgs> TopRangeChanged;
         public event EventHandler<PlayerChangedEventArgs> PlayerChanged;
         public List<Card> CurrentHand { get; set; }
+        protected int nbCardAtBeginOfTurn;
+        protected List<Card> CurrentCardPlayed = new List<Card>();
 
 
         public GameManager(int nbPlayer, List<String> players)
@@ -38,11 +40,11 @@ namespace TheGameExtreme.model.manager
             {
                 if (i < 2)
                 {
-                    ListOrderedStacks[i].Push(new Card(1));
+                    ListOrderedStacks[i].Push(new ClassicCard(1));
                 }
                 else
                 {
-                    ListOrderedStacks[i].Push(new Card(100));
+                    ListOrderedStacks[i].Push(new ClassicCard(100));
                 }
             }
 
@@ -51,13 +53,46 @@ namespace TheGameExtreme.model.manager
             distribueCard();
 
             CurrentHand = playerList[currentIndexPlayer].getCardList();
+            nbCardAtBeginOfTurn = CurrentHand.Count;
         }
 
         protected void createDeck()
         {
+            Random random = new Random();
+            List<int> endGame = new List<int>();
+            while (endGame.Count < 4)
+            {
+                int r = random.Next(2, 99);
+                if (!endGame.Contains(r))
+                {
+                    endGame.Add(r);
+                }
+            }
+            List<int> threeCard = new List<int>();
+            while (threeCard.Count < 4)
+            {
+                int r = random.Next(2, 99);
+                if (!endGame.Contains(r) && !threeCard.Contains(r))
+                {
+                    threeCard.Add(r);
+                }
+            }
+            Card card;
             for (int i = 2; i <= 99; i++)
             {
-                deck.Add(new Card(i));
+                if (endGame.Contains(i))
+                {
+                    card = new EndGameCard(i);
+                }
+                else if (threeCard.Contains(i))
+                {
+                    card = new ThreeCard(i);
+                }
+                else
+                {
+                    card = new ClassicCard(i);
+                }
+                deck.Add(card);
             }
         }
 
@@ -121,6 +156,7 @@ namespace TheGameExtreme.model.manager
             {
                 Card oldCard = orderedStack.Peek();
                 playerList[currentIndexPlayer].joue(card);
+                CurrentCardPlayed.Add(card);
                 orderedStack.Push(card);
                 OnTopRangeChanged(new TopRangeChangedEventArgs(card, oldCard, ListOrderedStacks.IndexOf(orderedStack)));
             }
@@ -152,7 +188,7 @@ namespace TheGameExtreme.model.manager
             }
         }
 
-        abstract public void endTurn();
+        abstract public bool endTurn();
 
         abstract protected void pioche();
 
diff --git a/TheGameExtreme/model/manager/SoloGameManager.cs b/TheGameExtreme/model/manager/SoloGameManager.cs
index 2e9d9bc..f6fd159 100644
--- a/TheGameExtreme/model/manager/SoloGameManager.cs
+++ b/TheGameExtreme/model/manager/SoloGameManager.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using TheGameExtreme.model.effect;
+using TheGameExtreme.model.card;
 using TheGameExtreme.model.@event;
 
 namespace TheGameExtreme.model.manager
@@ -14,9 +14,9 @@ namespace TheGameExtreme.model.manager
 
         }
 
-        public override void endTurn()
+        public override bool endTurn()
         {
-            // Vérifie que l'utilisateur a bien joué deux cartes
+            verifyNbCardPlay();
 
             pioche();
 
@@ -27,18 +27,55 @@ namespace TheGameExtreme.model.manager
             }
             CurrentHand = playerList[currentIndexPlayer].getCardList();
             OnPlayerChanged(new PlayerChangedEventArgs(CurrentHand));
+            nbCardAtBeginOfTurn = CurrentHand.Count;
+            CurrentCardPlayed.Clear();
 
             if (isEndGame())    // Ajouter le score en calculant les cartes restantes dans la pile et dans les mains des joueurs
             {
-                if (win)
-                {
-                    Console.WriteLine("Le jeu est terminé!\n Bravo vous avez gagné!");
-                }
-                else
+                displayWinner();
+                return true;
+            }
+
+            return false;
+        }
+
+        protected void verifyNbCardPlay()
+        {
+            foreach (Card cardPlayed in CurrentCardPlayed)
+            {
+                if (cardPlayed.GetType() == typeof(ThreeCard))
                 {
-                    Console.WriteLine("Le jeu est terminé!\n Désolé, vous avez perdu... Essayez encore!");
+                    if ((nbCardAtBeginOfTurn - CurrentHand.Count) < 3) // Penser à vérifier s'il a joué une ThreeCard pour regarder s'il a bien joué 3 cartes
+                    {
+                        testIsEndGame();
+                    }
+                    return;
                 }
             }
+            if ((nbCardAtBeginOfTurn - CurrentHand.Count) < 2) // Penser à vérifier s'il a joué une ThreeCard pour regarder s'il a bien joué 3 cartes
+            {
+                testIsEndGame();
+            }
+        }
+
+        protected void testIsEndGame()
+        {
+            if (isEndGame())
+            {
+                displayWinner();
+            }
+            else
+            {
+                throw new Exception("Vous n'avez pas joué assez de carte!");
+            }
+        }
+
+        protected void displayWinner()
+        {
+            if (win)
+            {
+                EndMessage = "Le jeu est terminé!\n Bravo vous avez gagné!";
+            }
         }
 
         protected override void pioche()
@@ -46,6 +83,10 @@ namespace TheGameExtreme.model.manager
             int nbPickedCard = nbMaxCard - CurrentHand.Count;
             for (int i = 0; i < nbPickedCard; i++)
             {
+                if (deck.Count == 0)
+                {
+                    return;
+                }
                 int random = new Random().Next(0, deck.Count - 1);
                 playerList[currentIndexPlayer].pioche(deck[random]);
                 deck.RemoveAt(random);
@@ -67,7 +108,7 @@ namespace TheGameExtreme.model.manager
         {
             CurrentHand.ForEach(card =>
             {
-                if (card.Value < ListOrderedStacks[0].Peek().Value || card.Value < ListOrderedStacks[1].Peek().Value || card.Value > ListOrderedStacks[2].Peek().Value || card.Value > ListOrderedStacks[3].Peek().Value)
+                if (card.Value > ListOrderedStacks[0].Peek().Value || card.Value > ListOrderedStacks[1].Peek().Value || card.Value < ListOrderedStacks[2].Peek().Value || card.Value < ListOrderedStacks[3].Peek().Value)
                 {
                     playableCard.Add(card);
                 }
@@ -76,13 +117,14 @@ namespace TheGameExtreme.model.manager
 
         protected override bool testEndGame(List<Card> playableCard)
         {
-            if (playableCard.Count < 3 && playableCard.Count >= 2)
+            if (playableCard.Count == 2)
             {
                 foreach (Card c in playableCard)
                 {
                     if (c.Equals(typeof(ThreeCard)))
                     {
                         win = false;
+                        EndMessage = "Le jeu est terminé!\n Désolé, vous avez perdu... Vous deviez jouer trois cartes à cause de l'effet \"Trois cartes joué\" hors votre jeu ne permet pas d'en jouer autant! Essayez encore!";
                         return true;
                     }
                 }
@@ -90,11 +132,13 @@ namespace TheGameExtreme.model.manager
             else if (playableCard.Count < 2)
             {
                 win = false;
+                EndMessage = "Le jeu est terminé!\n Désolé, vous avez perdu... Essayez encore!";
                 return true;
             }
             else if (effectLose())
             {
                 win = false;
+                EndMessage = "Désolé, vous n'avez pas recouvert la tête de mort... Réessayez ;)";
                 return true;
             }
 
@@ -105,7 +149,7 @@ namespace TheGameExtreme.model.manager
         {
             foreach (Stack<Card> orderedStack in ListOrderedStacks)
             {
-                if (orderedStack.Peek().GetType() == typeof(EndGame))
+                if (orderedStack.Peek().GetType() == typeof(EndGameCard))
                 {
                     return true;
                 }
diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml
index 2094d4b..cac5c5b 100644
--- a/TheGameExtreme/view/MainPage.xaml
+++ b/TheGameExtreme/view/MainPage.xaml
@@ -19,7 +19,7 @@
                     <Label HorizontalTextAlignment="Center" x:Name="pile0" />
                     <StackLayout
                         Orientation="Horizontal">
-                        <CheckBox x:Name="checkbox0" />
+                        <CheckBox x:Name="checkbox0" CheckedChanged="radioButton" />
                         <Label VerticalTextAlignment="Center" Text="Pile Ascendante" />
                     </StackLayout>
                 </StackLayout>
@@ -28,7 +28,7 @@
                     <Label HorizontalTextAlignment="Center" x:Name="pile1" />
                     <StackLayout
                         Orientation="Horizontal">
-                        <CheckBox x:Name="checkbox1" />
+                        <CheckBox x:Name="checkbox1" CheckedChanged="radioButton" />
                         <Label VerticalTextAlignment="Center" Text="Pile Ascendante" />
                     </StackLayout>
                 </StackLayout>
@@ -37,7 +37,7 @@
                     <Label HorizontalTextAlignment="Center" x:Name="pile2" />
                     <StackLayout
                         Orientation="Horizontal">
-                        <CheckBox x:Name="checkbox2" />
+                        <CheckBox x:Name="checkbox2" CheckedChanged="radioButton" />
                         <Label VerticalTextAlignment="Center" Text="Pile Descendante" />
                     </StackLayout>
                 </StackLayout>
@@ -46,7 +46,7 @@
                     <Label HorizontalTextAlignment="Center" x:Name="pile3" />
                     <StackLayout
                         Orientation="Horizontal">
-                        <CheckBox x:Name="checkbox3" />
+                        <CheckBox x:Name="checkbox3" CheckedChanged="radioButton" />
                         <Label VerticalTextAlignment="Center" Text="Pile Descendante" />
                     </StackLayout>
                 </StackLayout>
@@ -69,6 +69,7 @@
             </ScrollView>
         </StackLayout>
         <StackLayout
+            x:Name="botPanel"
             Orientation="Vertical"
             Margin="20">
             <Button Text="End Turn" Clicked="endTurn"/>
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index f850d00..968e749 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -18,13 +18,23 @@ namespace TheGameExtreme
     [DesignTimeVisible(false)]
     public partial class MainPage : ContentPage
     {
-
+        private bool isFirst = true;
         private Main viewmodel;
+        private List<CheckBox> stacks = new List<CheckBox>();
+        Button button = new Button();
+        
 
         public MainPage()
         {
             InitializeComponent();
 
+            stacks.Add(checkbox0);
+            stacks.Add(checkbox1);
+            stacks.Add(checkbox2);
+            stacks.Add(checkbox3);
+            button.Text = "Retry";
+            button.Clicked += retry;
+
             viewmodel = new Main();
 
             viewmodel.BindingChanged += OnBindingChanged;
@@ -91,35 +101,67 @@ namespace TheGameExtreme
         {
             viewmodel.Alert = "";
 
-            int numStack;
-            if (checkbox0.IsChecked)
+            int numStack = 0;
+            bool hasFind = false;
+            stacks.ForEach(checkbox =>
             {
-                numStack = 0;
-            }
-            else if (checkbox1.IsChecked)
+                if (checkbox.IsChecked)
+                {
+                    hasFind = true;
+                    if (viewmodel.played(numStack, Convert.ToInt32((sender as Button).Text)))
+                    {
+                        botPanel.Children.Add(button);
+                    }
+                }
+                numStack += 1;
+            });
+
+            if (!hasFind)
             {
-                numStack = 1;
+                viewmodel.Alert = "Aucune pile selectionné! Veuillez séléctionner une pile.";
+                return;
             }
-            else if (checkbox2.IsChecked)
+        }
+
+        private void radioButton(object sender, EventArgs args)
+        {
+            if (isFirst)
             {
-                numStack = 2;
+                isFirst = false;
+
+                stacks.ForEach(checkbox =>
+                {
+                    if (!checkbox.Equals(sender))
+                    {
+                        checkbox.IsChecked = false;
+                    }
+                });
+
+                isFirst = true;
             }
-            else if (checkbox3.IsChecked)
+        }
+
+        private void retry(object sender, EventArgs args)
+        {
+            viewmodel = new Main();
+
+            viewmodel.BindingChanged += OnBindingChanged;
+
+            Alert.SetBinding(Label.TextProperty, new Binding("Alert", source: viewmodel));
+
+            inflateHand();
+        }
+
+        private void endTurn(object sender, EventArgs args)
+        {
+            if (viewmodel.endTurn())
             {
-                numStack = 3;
+                botPanel.Children.Add(button);
             }
             else
             {
-                viewmodel.Alert = "Aucune pile selectionné! Veuillez séléctionner une pile.";
-                return;
+                inflateHand();
             }
-            viewmodel.played(numStack, Convert.ToInt32((sender as Button).Text));
-        }
-
-        private void endTurn(object sender, EventArgs args)
-        {
-            viewmodel.endTurn();
-            inflateHand();
         }
     }
 }
diff --git a/TheGameExtreme/viewmodel/Main.cs b/TheGameExtreme/viewmodel/Main.cs
index f1eb7d1..928731a 100644
--- a/TheGameExtreme/viewmodel/Main.cs
+++ b/TheGameExtreme/viewmodel/Main.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using TheGameExtreme.model;
+using TheGameExtreme.model.card;
 using TheGameExtreme.model.@event;
 using TheGameExtreme.model.manager;
 
@@ -56,35 +56,60 @@ namespace TheGameExtreme.viewmodel
             BindingChanged?.Invoke(this, args);
         }
 
-        public void played(int numStack, int valueCard)
+        /**
+         *
+         *
+         * @return booléen de fin de jeu
+         */
+        public bool played(int numStack, int valueCard)
         {
             if (gameManager.isCanPlay())
             {
-                playOneCard(numStack, valueCard);
+                return playOneCard(numStack, valueCard);
             }
             else
             {
                 Alert = "Le joueur n'a plus de carte dans sa main!";
                 // Faire un toast
+                return false;
             }
         }
 
-        private void playOneCard(int numStack, int valueCard)
+        /**
+         *
+         * 
+         * @return booléen de fin de jeu
+         */
+        private bool playOneCard(int numStack, int valueCard)
         {
             try
             {
                 gameManager.joue(valueCard, numStack);
-        }
+                if (gameManager.EndMessage != null)
+                {
+                    Alert = gameManager.EndMessage;
+                    return true;
+                }
+            }
             catch(Exception e)
             {
                 // Faire un toast
                 Alert = e.Message;
             }
-}
+            return false;
+        }
 
-        public void endTurn()
+        public bool endTurn()
         {
-            gameManager.endTurn();
+            try
+            {
+                return gameManager.endTurn();
+            }
+            catch(Exception e)
+            {
+                Alert = e.Message;
+                return false;
+            }
         }
 
     }