main
parent
e77dd66b2f
commit
c6f3ee519c
68
main.py
68
main.py
|
@ -1213,11 +1213,14 @@ while run:
|
|||
selected_album = render_albums()
|
||||
|
||||
if current_mode == "select":
|
||||
if image_display is None or current_album != selected_album:
|
||||
selected_image = ImageRender(selected_album)
|
||||
image_display = True
|
||||
try:
|
||||
if image_display is None or current_album != selected_album:
|
||||
selected_image = ImageRender(selected_album)
|
||||
image_display = True
|
||||
|
||||
selected_image.render(screen)
|
||||
selected_image.render(screen)
|
||||
except (AttributeError, NameError):
|
||||
pass
|
||||
|
||||
event_list = pygame.event.get()
|
||||
|
||||
|
@ -1231,35 +1234,38 @@ while run:
|
|||
if not non_movable_area.collidepoint(pygame.mouse.get_pos()):
|
||||
can_move = True
|
||||
if current_mode == "select":
|
||||
clicked_image_rect = ImageRender.image_save(selected_album, current_img)
|
||||
clicked_image = clicked_image_rect.collidepoint(event.pos)
|
||||
if clicked_image:
|
||||
clicked = True
|
||||
update_puzzle_data(completed, not_shuffled, current_timer_text, current_moves, real_time)
|
||||
puzzle_data[f'current {puzzle_version}']["selected_image"] = IMAGES_PATH + selected_album + "/" + current_img
|
||||
with open(PUZZLE_FILE, 'w') as puzzle_file:
|
||||
puzzle_file.write(json.dumps(puzzle_data))
|
||||
completed, not_shuffled, timer_text, current_timer_text, displayed_current_moves, current_moves = load_data()
|
||||
elapsed_time = 0
|
||||
current_moves = 0
|
||||
shuffle_pieces(puzzle_pieces)
|
||||
load_puzzle()
|
||||
current_mode = "game"
|
||||
timer_running = False
|
||||
timer_start_time = 0
|
||||
real_time = elapsed_time
|
||||
total_paused_time = 0
|
||||
timer_button.disable()
|
||||
clicked = None
|
||||
last_click_time = pygame.time.get_ticks()
|
||||
try:
|
||||
clicked_image_rect = ImageRender.image_save(selected_album, current_img)
|
||||
clicked_image = clicked_image_rect.collidepoint(event.pos)
|
||||
if clicked_image:
|
||||
clicked = True
|
||||
update_puzzle_data(completed, not_shuffled, current_timer_text, current_moves, real_time)
|
||||
puzzle_data[f'current {puzzle_version}']["selected_image"] = IMAGES_PATH + selected_album + "/" + current_img
|
||||
with open(PUZZLE_FILE, 'w') as puzzle_file:
|
||||
puzzle_file.write(json.dumps(puzzle_data))
|
||||
completed, not_shuffled, timer_text, current_timer_text, displayed_current_moves, current_moves = load_data()
|
||||
elapsed_time = 0
|
||||
current_moves = 0
|
||||
shuffle_pieces(puzzle_pieces)
|
||||
load_puzzle()
|
||||
current_mode = "game"
|
||||
timer_running = False
|
||||
timer_start_time = 0
|
||||
real_time = elapsed_time
|
||||
total_paused_time = 0
|
||||
timer_button.disable()
|
||||
clicked = None
|
||||
last_click_time = pygame.time.get_ticks()
|
||||
|
||||
if to_left_button.is_hovered(event.pos):
|
||||
selected_image.update_index(-1)
|
||||
last_image_switch_time = current_time
|
||||
if to_left_button.is_hovered(event.pos):
|
||||
selected_image.update_index(-1)
|
||||
last_image_switch_time = current_time
|
||||
|
||||
if to_right_button.is_hovered(event.pos):
|
||||
selected_image.update_index(1)
|
||||
last_image_switch_time = current_time
|
||||
if to_right_button.is_hovered(event.pos):
|
||||
selected_image.update_index(1)
|
||||
last_image_switch_time = current_time
|
||||
except NameError:
|
||||
quick_game()
|
||||
|
||||
elif current_mode == "game":
|
||||
if non_movable_area.collidepoint(event.pos) and not timer_running:
|
||||
|
|
Loading…
Reference in New Issue