From 74dbd727b952efc3879107569da88952d9b20af4 Mon Sep 17 00:00:00 2001 From: theo Date: Fri, 20 Nov 2020 15:33:25 +0100 Subject: [PATCH] Assemblage --- SwichGIT/.vs/SwichGIT/v16/.suo | Bin 25088 -> 20480 bytes SwichGIT/.vs/slnx.sqlite | Bin 90112 -> 90112 bytes SwichGIT/src/js/main.js | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/SwichGIT/.vs/SwichGIT/v16/.suo b/SwichGIT/.vs/SwichGIT/v16/.suo index b19f85e33041e4e53c93cce4d0146e93f2405597..0ec2fc555eb61cf2e172f9fee9d371a37eddb289 100644 GIT binary patch delta 1930 zcmds2O-vI(6y90dQs^ucT55svQ$#3AfGSm@9I8~*wnC8_FT{d?7&RVjIiOWa^o9vx zUp$J2sAo*|1c?Vw6D9s!JeqjWcroEn67ZnDx9k{9{0q^GlYDtIZ|A*v|C?H1satF& zEVC+b%N2P|hMUQu+1IR0k|ci#T#zrYQ?M+L8V8V34kKA1Zor)h@dX!jxvL?Q z8N{^d`_H&{<9?HV=183g2ci(6An3joX)dA|K{D%CIr1tHb_DUOkZwj)Beo!F5CxJ1 zR}97Xdc#bW!@47>CmV1iyYf3n$S~myIU=P_+g}n5gq!OcmxPoJieZF%oy%_ z5q*dgh<=2)d=mFV;yl?EQ+a?>mdJV3rKOv7!7%SOi-c1Jum~*kQPv5=N{6Cdq!bGQ z$SBwT11Abzz`X2*OyN~F1tYeg!pK3YLE)&8!gLW<%bu>?+#NONulo#%ifgLF3fA)U zProZuOp-__OEO3?P@Eo1JTY>1u%SO5PhJGS^H@RZ%7AtDb!_6*k<`1&`B0ODwPJ%= zXHUWP_vh+f&OLj%SnQp=y%b?;`*AmE-;Zv2y{TmdfQGt|o> zE^I#xyE-{_hZqG^H6{--Oxf_s^_0_9YHJ~4DaFHG1TOG~_o_9EaQSF1^t!i#-)~1+ z4>_JjMj@((hwT=)Q|ngkZP2E8Az|-Sq)L>e!67t4#vb9+uws&EqbpGqHPh%3w=C2N zc&7E|@3t&(7YdLPTAF6R-;iF}X=dtf%($bO(|iy!VeM&0gwwFd)+IG&#t}8si2SA| zu_?l7)X<0#OamF2UgzjSa_P(?6!L^9w1ubB1@K}7ldawQgxU*TU z^}!oYm6e7NRT(vL{Cs~8SnHP560JzI0>AO=0^c0sMwHA#2%FN0>Z`1jh7zscn8nwb zHGmo1q1JALMo$jB?Xba2jrE82Sx;Yo{`kYk9m#0hgGt^uvG_N_D$+*5PiK5wR$Xn> wDjO(SqgJx8S`p$DS~`i~nCO>zM#e{i)OlFF0i>_71mB5O{k+CcNJ&{ZNTlpiZCc{VFIBg`-9m^ zTy&9bj(&!W=mTMink*($H1l5q3R%o>nGcIT8J|sv;h{_162b3lds$~TjfNM$;0Yu^Ul{_&DTY2|j?9oB2v@@QtQ_Z+ec&E1OO>kjb(OvQ6Xy&B+CF zMVDCh3rX?(|Ip}y+i6#f54lo!mNmmkeFv=YPJzNQi6BW>T8V?0rAuTc zBoqiaW{|W51tk(xuG?g+swbB!YMV$FmxIpM0IR$MVz!`Ag-W?<(ye6c$$c{WM65O_ z7?9wzNF!wz*C}zabj9*$PXw-+tuWS>4<5rIo&L@TpY>cFI;_3)R>^On&xhe7qY;)- zv0gLx-P#|$5uF*>%Zd7x$3(;>M?{s12;6(hFXZ6o%Mr43OoEAuE`d6v zG>cYKBX6qVe#K3JdX@@ZKBA(V;(fTMzX`3P6Ou(;Vye5S1LZvsD?XnnMZ+pHq^wZ& zBQcFp^Mh3Ob)snHAKu}R1iF0WZl`cB#vEr^4)p{Iw3u$e51m%nFzFNn(I|NBwZ#o~ z$7{a+W6=mTQS}Sa$arv^$D=I}x0k|_PXoW0%`k6PiwzE!-MJ^dIh@LawnGE^>@@`r z`5hyJkrVYtVy}Xy?iK5MzfRrY=W2fDXD79Xre6P+Od!{?1=j41x^wH@k@+jPj#(}? z{&Z)3=rri+HpJ$g%Q|>W-~V^N)oH&$u=nbkFapkW1a`>Jzqc*?sGMY?p0^!!N=6V< zl&={GAKkeWBy7?{ZJgbpkbGPl%h^p;U$Rl)6Hl+gYSUJ_@95`1J5Xzb-)jt@D|$9{ z=fvGgI8o%!RCrHr#e+N!t$c35txmWD!kf(tr`On5nlGkz?Sp{ZusG(v#1J{Y{X&-j diff --git a/SwichGIT/.vs/slnx.sqlite b/SwichGIT/.vs/slnx.sqlite index 8859df0b1b5a23fd45c816331e03735be3300fcd..e1f2643fec165f5ca145217af53ac9d34c689f46 100644 GIT binary patch delta 1852 zcmZWqYitx%6ux(7cDl1W_nzHu%eJ;Dj^@LhhqrF;b%Al$1<+>55gih&&?H=D^Yn(Bpi>+$)#cD z=;F9)aaA(0Md^@}jq#L{+FD@Y=3)c4RZYn;Q(2c8ucgjs$q1^kUqNsUeuC5R3AqT{ zVI3@l3VM~EqXXiETNRxMc-?kaoMvu;@5>N?4#KKD4ze&w!CpPq@l>(Z> z^y-U>+8s|TDgWkpmvhouF~zzmkxovtYQg5hUNcOw&pbdZk&dT=(@~_v#`0+O+7nU47XE2g-oZ! zx^nm;(8nPl3LWysbeBJx=$Z@#dr`rZ7)HiQBA|N4h30B25V>qp?Qm;FwwiOTRax;) zYalDut}HCS-(;KFrCM=G2C6Y?2J0?$}*v7ka>=>u= z@T>^L)}(RqvX({`G8@swnM|^hCsh_xwJf2NYto2Km4AzBi`>`Q=?PRLjU%`N?QlvO zhY#p1S^&H0D7BF5pJJym+!~UJt@*<@A46phe)^BCE;{gQ$j1Sl}Mqf}8A0 z>xXLi4KBft@B@4WpTkFR2=+iFyFpLEx7uUv{!F=VKh-AU`}r%#YSoS;mh>{-tyZ2x znAabi{;+Ty67BRo#?&B!+wc?|mj+=U`Ir0-Z_y!gjSXM>~-ZX3uf=#g<7 zJ&E$LnzHe3WYFf|J=o-px^27*Gv=)Mbc}(NxX8OP);EFL`9iD{q*|T8doj)pJ-}IH zH$e~a^;mPZ6>6^D;|o}N(MUjfFPg%%kyxkN5Ol8d*im${^-mIJje_Bf>*x?@!~H=4 z!w7;A_I?Jmk$nO7K89c{=i!d(P+8R9zF*e8y|Vioxk P`|yPKPyqW5;P(Fj@j@^Q delta 3785 zcmZu!eQ+Da72nmJ&brg>KFji#VmnG=JFe@AY}v9UInIak$q<}`n9vRsJ7@Xg$k>uc zCx>`|QA#@uEfW&BG9BoUOlV6(T83l{?UXhpLqZAdOagT}p-@@~Op?w3fu?EtHA8pr ze6p0pe>~sr``Gv1{`R-4-N)U#kGuEP;4P2WuEtxAZW{>V4)fJupu4@TwY{yqZ9zEF z-4^Z+w^d>hHC6Q|cIe~UoqEPdrc>ciN2rs)%g7CnBDezY!$Eih9-a0rn1WonTUdho zr^biUV{7#7$y74SJd`p)XvUi}>7B`8J+n5IO=hQD2%$20U2;tCPiU!>o>{Gxi_EuZ zhAk_UyPVl6Bdd?w-o0Kd)Zl(Sn@y%hB!$J2UU^v}=5<+w;zzJMP+askdRJgrdx5B9q?EI$;bNc11>!RqYB1 zH8HFE(wTdW2`!;>ZPbZTxm-duOuI8-c{%gB-r8lhTfd&!sb@A%WkbmVw|PAhs%LKF z>ETJXa#6^tr4p*+x}=dPQY`G2P#AlpWXhOeHLE1QPh|@=ad;77TuU=FEXlbo6~d@Y3f=f)Xd^;)-u_o zzFuR?7DlfQ%{hjPG=aquTF4xesbSsx!3J5fb1)BY2+pQMClTe_IIbmAq0!0)dsFR^ zQRd`dTW{~FabMEdk(x}hE~Z9G^V&rP+R^l6rbruDXy-7Vo=j!i^Qs&NVqigmE}YkK zRb9}oc`P}yBbyjYPYxHW=iBOGEpzX6kuC4K>(s@;Yip&Lg>CMBWAK_92{p2&FvKKo zsMh@AwkoHOw6D?mjQ7=h?d~>KNhoeU)>o~x`<)h<-|1W6SiacjG~efzkRN#@Ba?6p z%l$Sax2IFtIsEv_B;;d29W~sJVHstELPKj$xH0OaRnd}MC28fqC5Yq=VqV+W;Cz0vv8~6B z8<6?7dZhlWmf1Q!wkDm(AD)26-th#hPfKJA&z1T0P5H39H&x66)aSBOWI>$ut0Jr- z*0wyuc^vB~nk(zrr>+sa}CYw1v)7UxBCS z1?nMRyGqW}Ye2vatLSO<0{oeNMz*L=(s#%i@=f&-br*esnsgVvoA!|7s;k)Dj*`xkJy^Cn-Ez=82_j_|yLI=N@uBYhUfDpwurR9}A zp$QjJ@d_`yi)QI}IoIa=7gpcxjEGqCEiqWG2JPV(|f8n377ruaI zxBwr(yKt7>y;tDZ@N+lRHstiBM1^kdA)m3l-!vcPLawu#x#Hd0~u zb(bNJ=)=~RB37`BIrWxWIn5C+!08eegadt^*on>3!3xutJGR`4%n^?e6@#b%;nr{t z;+COx4%oUbcm}}?Ji~zcI7ktfh_*JG1HlG0+!g8!b%i2bk+wE-W^dTzg8c~2!hUA? z1h_lJt&Nx)l0rk5dGVzW~x zUizq%T_0G+QiE;u_RA&wNi4u+#LnSWxIFDU@*ynYM<6b68DogYas%PbqYokY7*4=G z(4Y(Ev19rcX z(2Q*ULyj+&n>@^~KU@)D7mwzL%0H?A9oHliEMC&%k` z#&T@F92S^;YpZRa$mm*@^&`!GzF3dp8z$r!tHs4!SS>d%CB{m@%)lvSwe>c(WlXHI z_ECXh1b>4kVJG9%85o9F;RVLA-)38M3*`8PQ?wZhXXUxRmkN!zu)iLDK{%}}QG~!O z+9e*Ss6lRiz08JonjlsPt+=qxxK+7O7}O;T0og8r!%%_OXJN>S_=x>nJO^*X@8NX@ i@aMr|?YLq=Q?{hXk|mauxQw|iDO$1szOiRNpZGuA;1;d` diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 9e8e879..f10bb9b 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -549,7 +549,85 @@ function comparaisonTotal(CarteMere, CarteFille, index) { } +//Assemblage +function assemblage(carteselect, carteMere) { + var Carte; + var CopieCarteMere = carteMere;; + var CarteParallele; + var TabComparaison; //tab pour receptionner comparaison total + var TabRetour = []; //tab pour renvoyer code et carteMere + var TabRetourAss = []; //Tab retour pour l'appel récurssive de assemblage + var TabRetourAss1 = []; //2e Tab retour pour l'appel récurssive de assemblage + + if (carteselect != null) { + TabRetour.push(0); + TabRetour.push(carteMere); + return TabRetour; + } + + else { + Carte = carteselect[0]; + CopieCarteMere = carteMere; + TabComparaison = comparaisonTotal(carteMere, Carte, 0); + } + if (TabComparaison[0] == 2 && carteselect == null) { + TabRetour.push(2); + TabRetour.push(carteMere); + return TabRetour; + } + if (carteselect == null && TabComparaison[0] != 2) { + TabRetour.push(0); + TabRetour.push(carteMere); + return TabRetour; + } + + if (TabComparaison[0] == 2 || TabComparaison[0] == 0 || TabComparaison[0] == -1) { + carteselect.push(carteselect, Carte); + return assemblage(carteselect, CopieCarteMere); + } + + if (TabComparaison[0] == 3) { + CarteParallele = carteMere; + //pb tabRetour ? + TabRetourAss = assemblage(carteselect, CopieCarteMere + CarteParallele); + TabRetourAss1 = assemblage(carteselect, CopieCarteMere + CarteParallele.carteVerticale); + if (TabRetourAss1[0] == 2) { + TabRetour.push(2); + TabRetour.push(TabRetourAss1[1]); + return TabRetour; + } + if (TabRetourAss[0] == 2) { + TabRetour.push(2); + TabRetour.push(TabRetourAss[1]); + return TabRetour; + } + TabRetour.push(2); + TabRetour.push(carteMere); + return TabRetour; + } + + if (TabComparaison[0] == 4) { + CarteParallele = carteMere; + TabRetourAss = assemblage(carteselect, CopieCarteMere + CarteParallele); + TabRetourAss1 = assemblage(carteselect, CopieCarteMere + CarteParallele.carteHorizontale); + if (TabRetourAss1[0] == 2) { + TabRetour.push(2); + TabRetour.push(TabRetourAss1[1]); + return TabRetour; + } + if (TabRetourAss[0] == 2) { + TabRetour.push(2); + TabRetour.push(TabRetourAss[1]); + return TabRetour; + } + } + + if (TabComparaison[0] == 1) { + return assemblage(carteselect, carteMere); + } + +} //================================================================================== @@ -571,6 +649,8 @@ function EnvoyerNouveauNom() { }; + + /* function addplayer(){ //j'ai mis une limite de 6joueurs, mais c'est à voir