diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index d4ad6af477c1a16b1ac037ac9165ddd7aee8233c..3fd4965a4e95f6e1f9b8e77b6e88ea22038c0d95 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 Binary files a/game2048/__pycache__/grid_2048.cpython-36.pyc and b/game2048/__pycache__/grid_2048.cpython-36.pyc differ 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 Binary files /dev/null and b/game2048/__pycache__/run_2048.cpython-36.pyc differ diff --git a/game2048/display_grid.py b/game2048/display_grid.py index 6b15797de3d04f83d13961f6653113aa3760219d..bc0c3f0ab56b6abbbf66f8890f5080507eb5066e 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 c4644fe1f6ea7efa8770ab6d78c11e1b33bfc0de..b245e0b619426b95b75ead9b14262ddcea2a9a77 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