From 9f9aa5e660f77a418d035895a825f0830a55c40e Mon Sep 17 00:00:00 2001
From: unknown <thomas.bianco@student-cs.fr>
Date: Wed, 14 Nov 2018 16:51:45 +0100
Subject: [PATCH] =?UTF-8?q?d=C3=A9but=20objectif=20Z?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/inspectionProfiles/Project_Default.xml | 2 ++
game2048/__pycache__/grid_2048.cpython-36.pyc | Bin 5275 -> 5702 bytes
game2048/__pycache__/run_2048.cpython-36.pyc | Bin 0 -> 1181 bytes
game2048/display_grid.py | 30 +++++++++++++++++-
game2048/grid_2048.py | 5 ---
5 files changed, 31 insertions(+), 6 deletions(-)
create mode 100644 game2048/__pycache__/run_2048.cpython-36.pyc
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index d4ad6af..3fd4965 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -12,6 +12,8 @@
<option value="E501" />
<option value="W29" />
<option value="E501" />
+ <option value="W29" />
+ <option value="E501" />
</list>
</option>
</inspection_tool>
diff --git a/game2048/__pycache__/grid_2048.cpython-36.pyc b/game2048/__pycache__/grid_2048.cpython-36.pyc
index b4ec16f7a48441ea6719758968776a24b0e1f56d..06b19fca769b3891eef2effb4d8aff82f9ecd0f6 100644
GIT binary patch
delta 2271
zcmbQOc}z#yn3tF9l*OCqMtKH?#|%h7h=GB@fq{Xc*kq#ehWe-!s}$=N#we~7n-tp?
zhA8e7yA=BthA5sChZM&ahA7^Y=oF_E=N85&z7&@f*A|8-{uH+q_ZEgIffSDv&lZL#
z!4$6)?-qtAp%kAK-xh`_;S|3V{}zTQk(7Xxz!rum(UhQ+;1-4`v6PUM&=!U$@szNX
z@D_$BiIj+xNX-_8D9IGYU<S>YmmoL#MX|f2rX`l<l-y#t#b|Vk(c~7R#Vsa7vs;@B
z8KW2()h3@|ieuE6tj%n%!O6hDP{hT+z@W)=i>WB(7F%*ger9rNks3%GL8woj#H`Gy
zJ$V~*uC_8rHOnoQ^rFm^DAtn9oYdl5EIFBZsZlH-4w6>&$$l(ajQW!+S*A$pfOIk6
zV$Mm;D^da(4mO6ZNO!UttGci%0|Ub?#w--Q39J^3#*=5VnyMLt)N6tWEs!ZpMY<ri
zA&5YB;ultBMw7`BY>w(6%ZeCb@|w(G4YwF8ZZTG(Skb_y%xFG&37eyu2}rRv$aIL}
zB2$on8Hhl(f}359%>pFIHQ9*W-5eBpn#@HSAQ7;qKysSQMJgZxkRziw@>0v=F@j|S
zy8@%-<csW=I6*G`#b{f^Ie86-z9PtsTWo3hMY)M3MFt?(utS{AT9T2Pn_8qY`45K<
zH?o6_Ih`4uCYN)TNQ0F#-D1)+xW!ne$yj6$asybY`eZgPZ)1IsanPWH%fZyCgB05`
zFffFJ5;YSj6)_gsPHy4KFaep16k{y6n2Yku!9Kjj4)Pp`2Z}zFfK}jDVf38r%Dq_J
z24pfQoWSv+$qe>Zk<#S<+@dP(AUUvJaDW+sxL_B939y^ICR^~xGkQ&q;0e<91j&1W
z2#}jJnTx>s!CE~)qF`NMLVfa89wkQa$v=2(H9!t{`Tzg_|3yBa5MV6whEQP5VAWtk
zeR3?XJfrXCT3#u}dXV`DKZA7?`GS%tUrAA7UU5NwacVp$`D=1OqK7dhimfCuGbbk%
z65$}ZB2f7Nc48D8h#y}P#RUp42pc)HKn8Q>=9fXttYTo8EXHrl7(CgFzZ}ganru<5
zIhn;Jso?OB;)S{<9wO$*z`zj2o0FNIml_Y1fj9!}K`;Rh(?A9WhMAyv768RFGY2CJ
zBOe%xG4e4Lfn<|Gc?Tpp*;hzhIh`S!DVRZ%(NB}H2$U5y8Nt3r_QK>U0a?b7$uk7J
zBmF>8;SVALKptaB$uG~-WGO-wE(!%j0#gyF5GV=;u_4*+7H2_zadBo+PHJ&c5XcO$
ztHFf&WE(*h#_-9Bf)-XGASqB%#o`o@r97F%@#%@Vsqy(`sYRPXUIiy<rlN?+iGq@o
z-w2AyxPgoS=LsynkrPs4jGXK!WFj63avK&EJwh^!QIl5+)fs_321;Z_U{8aSI>_fQ
znL#!{{Rwg_*t4LrXmX^mG)g9}7dEetVPIfL1_e0?gIvqXz`)=Pa(W8`149Wz3S%>4
zEkg-o2~!P233CdQBuIq0nURs9!lQ(xhM}3UIHiO&i>-tm#BOG+Wh~*SVW?qjW~yZ<
z;RK0c*ImMx0y3qZp-?WIp@a*hu&APhF@*(WbRI_uV+t#XmBtXvpvmS3t}2QY7#J9;
zRJpVW1FkADXMaEUAjgnk1x1BO|4@Z+e?J99Ma3#%5Xa5Y(?>@kBq&m$-qGFB(@>
z$PyHPtOZ4xc_l?oAU0cwhpVq^a8U#(IN_B*5h%RCDW?cj<`zYP;)&@NCpdS3q8=mp
zfXw19O3X{i&y6q0Nvu2%3R?+KXtQuIiqtc6G4nBUF>)}9F!C^SFmf?*Fcu|%3}poS
zS(6b`en~~KLCh!uJ0%X}C~)x)sym86=?R=gioo@WIY<`lJdm%z-YEhVvPFoJ3{)6_
zik1uph-W~#uLz#JA)W@ML9hoQo(8!JDeplt2gr9EHo5sJr8%i~pxj#wD#JLKa#%Px
ZI9ND1IRrRZIoLSZxF$D<NHcNp0|4Xp$nXFF
delta 1802
zcmX@6Gh0*Hn3tC;RsK!%0ci$?#|%h7h=GB@fq{XcSZkv4hI-2ss}_bRt`zGOn-+#B
z?iAY;yB3Bho)r5OhZcq?-jwhZ#}ua)#wflN=M<L~hA93N*A%xFhA4p)_Y{v7hA6=l
z&lIl~hA5#F?-ZXFhA80_-xR+VhA5E~|CE3hhA7dLz?7gChA6R=;FORShA8or(3G$i
zhA4>?#$X1`h{-XGQmj!-hGtQls~Mvh8C51<V~S%`n{3K#uffj1z)-}&z`&r%bc?Ad
z<rZ6VMt){;YLN;^96_i~p2Muns5$unb1tLeWIYynZe+O#7A;2I$;~WNB(*>$G2dd&
zNzE%#02!eO5@0LRo@~IXF09PJz;KH(3(0WR$yuxxjE0jJvzn?Ig4C;n2n~=XrXp<+
zTOULqTlSAtnbByn5}Tts$g(0vn7k%4Si>#Gid&48C{}c_DKnZ*c4U{Fe4I@~%?PAH
z6J!HKLy<8^zyw4fTO-P@#%MO#k=@-K6hxZLMQR`wU_Y5bG%JAwKyHlU$V)AcFUib7
z4mQ=v``Hy3%_l!#zr+c0=r2awBKFC<IrJ4lX53;+%P-1JEGg0hnZ*uqIcrHqYHn(g
z(qwK<9hC5O;&f(onB2x$A`Mo~bc;#P;1*+<CS#E;$PHj;t4<c>@;25583zqHxExHK
zDoC+40|P@iC}lE%k}G48_2dK0l9ShP`I~^uMv63+Tg*lI<wYQ0-eL!N5X1w;AWGQk
zbE`1APY&T;9AE`99TZmJDA8mFdkt*fE#BPxvefvT)U=ZLq|9PXmLgY>TCiCl<BJSH
zT(B>|1lXM(lihjb89gSa^8{(TgXBFx1jvn=%n<!xt!^Muur4s6I{68Y5~Js2c3xWz
zkb_?S|NsAgkryab7>hh16xedGYA~TXIfqxC(R*_buN0#<$b7Jyi$Dn%tfR;qlxq1(
ziW2jR3-XIo<I{^WQ#3gsQO1}O#a5D-nUj+WNdzFdB0G?qTql3zlR$|@5q=lOz{!#P
z<@KnxXtG7I=42L^q=LgbiWh2AJVeZ%fq@~4HzzYaFEt)21F-<?crXDDFMkFGhMAyv
z6#&I6GY2CJBOe%xG4e4Lfn<|GSp_6HIYvlaIh`S!DVRZ%(NB}H2$b_Q8Noh6iQG;B
zS;nBr%LTk6eL!CF1rdIr&|pc)FVE9tDMA%43I+u*6C~&YL2O74i{dQEFD}kZ%1JFQ
z3ILe_b~Tt#o$M{B!Wc5SK+wV}2qYB((uV02kfl7C#qsHhxvBB_WvNA*L0$zXVWy(c
z$pwOvlYa|}$+&=w0OtWrBPQz#DKUmk4iGXC55sQB<k><pjNy}a2-QV^JqAiZMPN^Z
zlQqcaFPT9$K>Z1FE7-Hpq9=+I6lL*A`T03fTwrEeW?o_rN|5#mo7YD|tOrGhreqXb
zQDR<7er^${<h#Wd;^FG+8Vo6HK!sEh$T#2!DgqZ=rXc%41yGSWhy|)+ia=Sq2$4rX
z$sC+$i$HMzj`|{a*cOE{cr!2*fkL1NR16e>9E0RSNUVT@o5LnIKczG$)ehv&Vo;Lh
bV9H_P;NW24;N%eCVC7)rVB?sqDJBg78OCMT
diff --git a/game2048/__pycache__/run_2048.cpython-36.pyc b/game2048/__pycache__/run_2048.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8c81b8a02ee743faa1309fd3587d597527337a95
GIT binary patch
literal 1181
zcmXr!<>lI<{3iMr8w0~*1|-15z`)?Zz`#(f!oa|g!jQt4!w>?Y8ABLSm{OQq7^0X`
zSW;M97^0X{*n$}}*<XURYck$q)Jg`iKp12SD+2?AGsvVC1_p)_h7`tT##)9F#uBC)
zh7#r!CP|P8b2B3&Lxo2POASLaV{u9eYZhAxJBZ!PSj$+#QNvKf*vwSRP{Iik!>+r8
zF$HW&p<Fma2^UCRQAG)33Jb{OJdP5^6jl%`g&~+hlg;lX3j+hgEk=VXRW2>UfU8Q(
z+27AS$T1{XK~W*nKU5*y-%mkNQL#!G#Bp=<^wCiW35ry3ba(Xh)8xLznVFYa5}%%!
zn|h12peQr1<d#x;QD#bfNq&5BNl|8AdVG0iNk)8eW>so@VqQvoNk(dJY7|?DhpVq^
z@GYLqVzA!${Ib-dD5j#6D7NH`{LJLkTS7UR#U=5%`DLl`1^LCrnMpaRw>ZIEkny(!
zL1cVlN=kfQYI%G~W=`rY?v%`w_{#j!`0~s=O{QC%U=?78F{Z3!DB@>eVEAR}Y!wq)
zoLW>I6Oxgin^+tZP??;OSd<%3l%JKFTv8lkWME<u1JVR$6qV-1gBW@RmAANy67y2>
zbK?tg5-UMLS}XyIbrudr5oRuCK1MD^4n`419u^KpE+!7fB0&ZQ26)l{B?}M+Cyfc<
zq|wX(irQv|T5#fMW~^l@VJ=~*VX9%QVQ2<NZiP<?YYkH~V{t(VTQfr~a|t_$SIbhv
zT*H#hRuopkQNvWj+{{$VRKf|C!7!nO8I%AS84A@v$)tq4nX#w^lng<MBafqm8Ip*=
z$%Ms^Cdq>*imxa&F$EI)p!kU52lK&+ARZ)81PYfTHU<WUB6bkL!N9-}B@9*s3h30L
z_~iWD+{C<;B2JJr7l_~n5j-G*mw|ynll2x0D0M}#f=#`}0y6d%XG&&KYH~?teqIzO
zEd3ON(*T4J0A&hJP(*_xR2GzJ6+jWn%*M#Z%)uzY%*DvY$ic_~j#vRk9%g97iZU=T
z_-V34L6R3JaYXTyq*j!aCgy;X3OMGAK&l`Xfs!4B1-6pICO1E&G$+-L5o9CC-yDn_
HOdOH`KnfZq
literal 0
HcmV?d00001
diff --git a/game2048/display_grid.py b/game2048/display_grid.py
index 6b15797..bc0c3f0 100644
--- a/game2048/display_grid.py
+++ b/game2048/display_grid.py
@@ -1,9 +1,37 @@
import tkinter as tk
+from run_2048 import *
+
+TILES_BG_COLOR = {0: "#9e948a", 2: "#eee4da", 4: "#ede0c8", 8: "#f1b078", \
+ 16: "#eb8c52", 32: "#f67c5f", 64: "#f65e3b", \
+ 128: "#edcf72", 256: "#edcc61", 512: "#edc850", \
+ 1024: "#edc53f", 2048: "#edc22e", 4096: "#5eda92", \
+ 8192: "#24ba63"}
+
+TILES_FG_COLOR = {0: "#776e65", 2: "#776e65", 4: "#776e65", 8: "#f9f6f2", \
+ 16: "#f9f6f2", 32: "#f9f6f2", 64: "#f9f6f2", 128: "#f9f6f2", \
+ 256: "#f9f6f2", 512: "#f9f6f2", 1024: "#f9f6f2", \
+ 2048: "#f9f6f2", 4096: "#f9f6f2", 8192: "#f9f6f2"}
+
+TILES_FONT = {"Verdana", 40, "bold"}
+
def graphical_grid_init():
root = tk.Tk()
window = tk.Toplevel()
- window.grid()
+
+ grid_game = init_game()
+ grid_size = 4
+
+ background = tk.Frame(root)
+ graphical_grid = []
+
+ for i in range(grid_size):
+ graphical_grid.append([])
+ for j in range(grid_size):
+ graphical_grid[i].append(tk.Frame(master = background, bd = 2,relief = "raised", bg = TILES_BG_COLOR[0],height = 100, width = 100))
+ graphical_grid[i][j].grid(column = i, row = j)
+
+ background.pack()
root.mainloop()
graphical_grid_init()
diff --git a/game2048/grid_2048.py b/game2048/grid_2048.py
index c4644fe..b245e0b 100644
--- a/game2048/grid_2048.py
+++ b/game2048/grid_2048.py
@@ -204,7 +204,6 @@ def list_move_possible (grid):
return(list_final)
-<<<<<<< HEAD
def random_play():
#on suppose que le jeu par defaut comprend une grille de 4x4
@@ -228,7 +227,3 @@ def random_play():
else :
print ("YOU FAIL, TRY AGAIN")
return()
-
-#TEST random_play()
-=======
->>>>>>> 15883ac11a1d5e067e173c9ddba3c0e80ca1d0df
--
GitLab