From 861db5ce79583961b22f98f1c2eb9cf01f5f97ee Mon Sep 17 00:00:00 2001 From: IljaP Date: Fri, 26 Apr 2024 11:02:41 +0300 Subject: [PATCH] bug fix --- main.py | 9 +++++---- settings.py | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/main.py b/main.py index 9f3d5f6..dea1e44 100644 --- a/main.py +++ b/main.py @@ -163,13 +163,11 @@ while run: elif game_screen.lives <= 0: break - print(game_screen.lives) + # print(game_screen.lives) pygame.display.flip() # экран победы - - if win: text = "You Win!" else: @@ -190,6 +188,9 @@ while run: elif event.type == MOUSEBUTTONDOWN: run = False + elif event.type == QUIT: + run = False + surf = pygame.Surface((500, 200)) color = (255, 50, 50) surf.fill(color) @@ -197,6 +198,6 @@ while run: rect = surf.get_rect(center=(s.SCREEN_WIDTH / 2, s.SCREEN_HEIGHT / 2)) screen.blit(surf, rect) - screen.blit(text, (s.SCREEN_WIDTH / 2, s.SCREEN_HEIGHT / 2)) + screen.blit(text, (s.SCREEN_WIDTH / 2 - 100, s.SCREEN_HEIGHT / 2)) pygame.display.flip() diff --git a/settings.py b/settings.py index ab60db6..12e73b5 100644 --- a/settings.py +++ b/settings.py @@ -22,13 +22,13 @@ for v_up in values: # в каждом по 8 str_values = { 0: ["32*0", "2^2-4", "7-3.5*2", "-5+2.5*2", "0-0+0", "0/43", "False", "[1, 0][1]", "8*(3-3)", "not 3", - "6+6-6+6-6-6", "sum([1,-1])"], + "6+6-6+6-6-6", "sum([1,-1])", "0^0*3"], 1: ["0^0", "24/24", "True", "23>4", "1 or 0", "10-1*9", "sqrt(1)", "5^1/5", "7-6", "1!", "36/6^2", "-2+3", "if 'str'", "bool(-3)", "min({1,43})"], - 2: ["2!", "8^0.34", "int(e)", "True+True", "14/7", "sqrt(4)", "sqrt(4)^2", "int('2')", "(1<3)*2", "3-1", "1+1", + 2: ["2!", "8^0.34", "int(e)", "True+True", "14/7", "sqrt(4)", "int('2')", "(1<3)*2", "3-1", "1+1", "[7,7].count(7)"], - 3: ["2!*1.5", "9/3", "round(pi)", "sqrt(9)", "(18/2)^0.5", "True*3", "5-2", "6/2", "3+0^1", "0^0*3", "round(3)"], - 4: ["2*2", "3+1*1", "0+4", "int(e)*2", "8/2", "6-3+1", "(8+4)/3", "int('5')-1", "int(float(str(4.9)))", "sqrt(16)"], + 3: ["2!*1.5", "9/3", "round(pi)", "sqrt(9)", "(18/2)^0.5", "True*3", "5-2", "6/2", "3+0^1", "round(3)"], + 4: ["2*2", "3+1*1", "0+4", "int(e)*2", "8/2", "6-3+1", "(8+4)/3", "int('5')-1", "int(float(str(4.9)))", "sqrt(16)", "sqrt(4)^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]", "max((6,5))"]