robob/PyTaiko
1
0
Fork 0
mirror of https://github.com/Yonokid/PyTaiko.git synced 2026-02-04 19:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

two visual bugs squashed

Browse Source
This commit is contained in:
Anthony Samms
2025-10-26 23:30:50 -04:00
parent 708643ac71
commit 2674633988
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scenes/game.py
View File

@@ -552,7 +552,7 @@ class Player:
self.current_notes_draw[0].color += 1 self.current_notes_draw[0].color += 1
note = self.current_notes_draw[0] note = self.current_notes_draw[0]
if note.type in {5, 6, 7} and len(self.current_notes_draw) > 1: if note.type in {5, 6, 7, 9} and len(self.current_notes_draw) > 1:
note = self.current_notes_draw[1] note = self.current_notes_draw[1]
position = self.get_position_x(SCREEN_WIDTH, current_ms, note.hit_ms, note.pixels_per_frame_x) position = self.get_position_x(SCREEN_WIDTH, current_ms, note.hit_ms, note.pixels_per_frame_x)
if position < GameScreen.JUDGE_X + 650: if position < GameScreen.JUDGE_X + 650:
@@ -733,7 +733,7 @@ class Player:
def drumroll_counter_manager(self, current_time: float): def drumroll_counter_manager(self, current_time: float):
"""Manages drumroll counter behavior""" """Manages drumroll counter behavior"""
if self.is_drumroll and self.curr_drumroll_count > 0 and self.drumroll_counter is None: if self.is_drumroll and self.curr_drumroll_count > 0 and self.drumroll_counter is None:
self.drumroll_counter = DrumrollCounter(current_time, self.is_2p) self.drumroll_counter = DrumrollCounter(self.is_2p)
if self.drumroll_counter is not None: if self.drumroll_counter is not None:
if self.drumroll_counter.is_finished and not self.is_drumroll: if self.drumroll_counter.is_finished and not self.is_drumroll:
@@ -984,7 +984,7 @@ class Player:
current_eighth = int((current_ms - start_ms) // eighth_in_ms) current_eighth = int((current_ms - start_ms) // eighth_in_ms)
for note in reversed(self.current_notes_draw): for note in reversed(self.current_notes_draw):
if self.is_balloon and note == self.current_notes_draw[0]: if self.balloon_anim is not None and note == self.current_notes_draw[0]:
continue continue
if note.type == 8: if note.type == 8:
continue continue
@@ -1412,30 +1412,26 @@ class NoteArc:
class DrumrollCounter: class DrumrollCounter:
"""Displays a drumroll counter, stays alive until is_drumroll is false""" """Displays a drumroll counter, stays alive until is_drumroll is false"""
def __init__(self, current_ms: float, is_2p: bool): def __init__(self, is_2p: bool):
self.is_2p = is_2p self.is_2p = is_2p
self.create_ms = current_ms
self.is_finished = False self.is_finished = False
self.total_duration = 1349
self.drumroll_count = 0 self.drumroll_count = 0
self.fade_animation = tex.get_animation(8) self.fade_animation = tex.get_animation(8)
self.fade_animation.start() self.fade_animation.start()
self.stretch_animation = tex.get_animation(9) self.stretch_animation = tex.get_animation(9)
def update_count(self, count: int, elapsed_time: float): def update_count(self, count: int):
self.total_duration = elapsed_time + 1349
self.fade_animation.delay = self.total_duration - 166
if self.drumroll_count != count: if self.drumroll_count != count:
self.drumroll_count = count self.drumroll_count = count
self.stretch_animation.start() self.stretch_animation.start()
self.fade_animation.start()
def update(self, current_ms: float, drumroll_count: int): def update(self, current_ms: float, drumroll_count: int):
self.stretch_animation.update(current_ms) self.stretch_animation.update(current_ms)
self.fade_animation.update(current_ms) self.fade_animation.update(current_ms)
elapsed_time = current_ms - self.create_ms
if drumroll_count != 0: if drumroll_count != 0:
self.update_count(drumroll_count, elapsed_time) self.update_count(drumroll_count)
if self.fade_animation.is_finished: if self.fade_animation.is_finished:
self.is_finished = True self.is_finished = True