iprusakovs
/
Pygame-RKG-domino
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

master
IljaP 2024-04-26 08:46:57 +03:00
parent 55975b558d
commit 36ec1fd077
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -113,7 +113,7 @@ while run:
elif mouse_down == "right" and time() - r_click_time >= r_click_cd: elif mouse_down == "right" and time() - r_click_time >= r_click_cd:
r_click_time = domino.update_rotation(mouse_new_pos[0], mouse_new_pos[1], r_click_time) r_click_time = domino.update_rotation(mouse_new_pos[0], mouse_new_pos[1], r_click_time)
# если мы кликнули на кнопку, добовляем в руку новые домино # если мы кликнули на кнопку, добaвляем в руку новые домино
if not move and mouse_down == "left": if not move and mouse_down == "left":
values = False values = False
@ -193,6 +193,6 @@ while run:
screen.blit(surf, rect) screen.blit(surf, rect)
screen.blit(text,(s.SCREEN_WIDTH/2, s.SCREEN_HEIGHT/2)) screen.blit(text,(s.SCREEN_WIDTH/2 - 250, s.SCREEN_HEIGHT/2 - 100))
pygame.display.flip() pygame.display.flip()

8
screens.py
View File

@ -50,13 +50,15 @@ class Button(pygame.sprite.Sprite):
def active_button(self, mouse_x, mouse_y, r_click_time, dominos): def active_button(self, mouse_x, mouse_y, r_click_time, dominos):
# если нажали на кнопку, добавляем домино в руку # если нажали на кнопку, добавляем домино в руку
values = False
if self.rect.x <= mouse_x <= self.rect.x + self.w and self.rect.y <= mouse_y <= self.rect.y + self.h: if self.rect.x <= mouse_x <= self.rect.x + self.w and self.rect.y <= mouse_y <= self.rect.y + self.h:
# pygame.transform.rotate(self.surf, 90) # pygame.transform.rotate(self.surf, 90)
x = 110 * len(dominos) - 1 x = 110 * len(dominos) - 1
y = s.SCREEN_HEIGHT - s.DOMINO_H / 2 - 25 y = s.SCREEN_HEIGHT - s.DOMINO_H / 2 - 25
values = choice(s.DOMINOS) if len(s.DOMINOS) > 0:
# domino = Domino(x, y, values, len(dominos) - 1) values = choice(s.DOMINOS)
s.DOMINOS.remove(values) # domino = Domino(x, y, values, len(dominos) - 1)
s.DOMINOS.remove(values)
return time(), values, [x, y] return time(), values, [x, y]
return r_click_time, False, False return r_click_time, False, False

30
settings.py
View File

@ -8,14 +8,14 @@ DOMINO_H = 200
DOMINOS = [] DOMINOS = []
values = range(7) # values = range(7)
for v_up in values: # for v_up in values:
for v_down in values: # for v_down in values:
if not [v_up, v_down] in DOMINOS and not [v_down, v_up] in DOMINOS: # if not [v_up, v_down] in DOMINOS and not [v_down, v_up] in DOMINOS:
DOMINOS.append([v_up, v_down]) # DOMINOS.append([v_up, v_down])
# for _ in range(10): for _ in range(10):
# DOMINOS.append([[1, '1'], [1, '1']]) DOMINOS.append([[1, '1'], [1, '1']])
# print(DOMINOS) # print(DOMINOS)
@ -29,14 +29,14 @@ str_values = {
5: ["10/2", "25^0.5", "2*5/2", "4!-19", "True*10/2", "3+2", "100/20", "4*1.25", "int(5.839)", "5+5-5+5-5", "2.5*2"], 5: ["10/2", "25^0.5", "2*5/2", "4!-19", "True*10/2", "3+2", "100/20", "4*1.25", "int(5.839)", "5+5-5+5-5", "2.5*2"],
6: ["3!", "2+2*2", "round(pi)*2", "(if 6>1)*6", "10-4", "24/4", "sqrt(12*3)", "3^2-3", "2*(4-1)", "{1,3,6}[2]"] 6: ["3!", "2+2*2", "round(pi)*2", "(if 6>1)*6", "10-4", "24/4", "sqrt(12*3)", "3^2-3", "2*(4-1)", "{1,3,6}[2]"]
} }
#
for i in range(len(DOMINOS)): # for i in range(len(DOMINOS)):
v_up = choice(str_values[DOMINOS[i][0]]) # v_up = choice(str_values[DOMINOS[i][0]])
str_values[DOMINOS[i][0]].remove(v_up) # str_values[DOMINOS[i][0]].remove(v_up)
v_down = choice(str_values[DOMINOS[i][1]]) # v_down = choice(str_values[DOMINOS[i][1]])
str_values[DOMINOS[i][1]].remove(v_down) # str_values[DOMINOS[i][1]].remove(v_down)
#
DOMINOS[i] = [[DOMINOS[i][0], v_up], [DOMINOS[i][1], v_down]] # DOMINOS[i] = [[DOMINOS[i][0], v_up], [DOMINOS[i][1], v_down]]
# print(DOMINOS) # print(DOMINOS)