Skip to content

Commit edecbf4

Browse files
Code cleaning
1 parent daf0176 commit edecbf4

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

game.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def run_FGHJ(screen,clock,song_name,stage_speed,offset,judgement_shown,guide_lin
129129
song_bpm = chart_info[3]
130130

131131
# screen pause effect
132-
screen_update = True
132+
screen_freeze = False
133133
first_pause_time = song_length + 100 # no pause == pause after the end of the song
134134

135135

@@ -255,17 +255,18 @@ def run_FGHJ(screen,clock,song_name,stage_speed,offset,judgement_shown,guide_lin
255255
# 3.2 do the special effect
256256
if special_effect == 'wait':
257257
first_pause_time = pygame.time.get_ticks()
258-
screen_update = False
258+
screen_freeze = True
259259

260260
####### change background color! ########
261261
change_background_color = 1
262262
screen.fill(background_color[change_background_color])
263263
for T in tiles_off_screen + nodes_on_screen + holds_on_screen:
264-
T.draw(screen,screen_update)
264+
T.draw(screen,screen_freeze)
265265
draw_frame(screen)
266266
pygame.display.flip()
267267
####### change background color! ########
268268
#pygame.time.delay(wait_delay)
269+
269270
tiles_off_screen.remove(tile)
270271
break
271272

@@ -284,12 +285,12 @@ def run_FGHJ(screen,clock,song_name,stage_speed,offset,judgement_shown,guide_lin
284285
# draw basic frame with lines
285286
draw_frame(screen)
286287

287-
if screen_update:
288+
if not screen_freeze:
288289
pygame.display.flip()
289290
else: # check when the screen update should be true
290291
screen_cur_time = pygame.time.get_ticks()
291292
if (screen_cur_time - first_pause_time) >= wait_delay:
292-
screen_update = True
293+
screen_freeze = False
293294
change_background_color = 0 # set back to normal
294295

295296
clock.tick_busy_loop(fps)

tiles.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ def __init__(self,line,point,special = None):
1818

1919
self.special = special # special node
2020

21-
def draw(self,screen,screen_update = True):
21+
def draw(self, screen, screen_freeze = False):
2222
if self.special == 'BadApple':
23-
if screen_update:
24-
pygame.draw.rect(screen, (240, 180, 180),
23+
if screen_freeze: # at screen freeze
24+
pygame.draw.rect(screen, (0,0,0),
2525
[line_axes[self.line - 1] - line_width // 2, self.y - node_height // 2, line_width,
2626
node_height])
27-
else:
28-
pygame.draw.rect(screen, (0,0,0),
27+
else: # no screen freeze
28+
pygame.draw.rect(screen, (240, 180, 180),
2929
[line_axes[self.line - 1] - line_width // 2, self.y - node_height // 2, line_width,
3030
node_height])
3131

variables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
scoreboardMusic = 'Another way_FULL'
1111

1212
# player settings
13-
stage_speed = 60
13+
stage_speed = 80
1414
offset = 0
1515
judgement_shown = False
1616
guide_line_shown = False

0 commit comments

Comments
 (0)