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

feat(game): allow time timeline_index to go up to len(timeline), so that it doesn't get stuck on last timeline object

Browse Source
This commit is contained in:
mc08
2025-11-28 18:45:21 -08:00
parent 719a9f3717
commit 461f22e05e
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scenes/game.py
View File

@@ -415,7 +415,7 @@ class Player:
#Note management #Note management
self.timeline = notes.timeline self.timeline = notes.timeline
self.timeline_index = 0 self.timeline_index = 0 # Range: [0, len(timeline)]
self.current_bars: list[Note] = [] self.current_bars: list[Note] = []
self.current_notes_draw: list[Note | Drumroll | Balloon] = [] self.current_notes_draw: list[Note | Drumroll | Balloon] = []
self.is_drumroll = False self.is_drumroll = False
@@ -490,7 +490,7 @@ class Player:
return int((pixels_per_frame * 0.06 * time_diff) + ((self.tja.distance * pixels_per_frame) / pixels_per_frame_x)) return int((pixels_per_frame * 0.06 * time_diff) + ((self.tja.distance * pixels_per_frame) / pixels_per_frame_x))
def handle_tjap3_extended_commands(self, current_ms: float): def handle_tjap3_extended_commands(self, current_ms: float):
if not self.timeline: if not self.timeline or self.timeline_index >= len(self.timeline):
return return
timeline_object = self.timeline[self.timeline_index] timeline_object = self.timeline[self.timeline_index]
@@ -526,22 +526,21 @@ class Player:
global_data.camera.rotation = timeline_object.cam_rotation global_data.camera.rotation = timeline_object.cam_rotation
should_advance = True should_advance = True
if should_advance and self.timeline_index < len(self.timeline) - 1: if should_advance:
self.timeline_index += 1 self.timeline_index += 1
def get_judge_position(self, current_ms: float): def get_judge_position(self, current_ms: float):
"""Get the current judgment circle position based on bar data""" """Get the current judgment circle position based on bar data"""
if not self.timeline: if not self.timeline or self.timeline_index >= len(self.timeline):
return return
timeline_object = self.timeline[self.timeline_index] timeline_object = self.timeline[self.timeline_index]
if hasattr(timeline_object, 'judge_pos_x') and timeline_object.hit_ms <= current_ms: if hasattr(timeline_object, 'judge_pos_x') and timeline_object.hit_ms <= current_ms:
self.judge_x = timeline_object.judge_pos_x * tex.screen_scale self.judge_x = timeline_object.judge_pos_x * tex.screen_scale
self.judge_y = timeline_object.judge_pos_y * tex.screen_scale self.judge_y = timeline_object.judge_pos_y * tex.screen_scale
if self.timeline_index < len(self.timeline) - 1:
self.timeline_index += 1 self.timeline_index += 1
def handle_scroll_type_commands(self, current_ms: float): def handle_scroll_type_commands(self, current_ms: float):
if not self.timeline: if not self.timeline or self.timeline_index >= len(self.timeline):
return return
timeline_object = self.timeline[self.timeline_index] timeline_object = self.timeline[self.timeline_index]
@@ -577,16 +576,15 @@ class Player:
should_advance = True should_advance = True
if should_advance and self.timeline_index < len(self.timeline) - 1: if should_advance:
self.timeline_index += 1 self.timeline_index += 1
def update_bpm(self, current_ms: float): def update_bpm(self, current_ms: float):
if not self.timeline: if not self.timeline or self.timeline_index >= len(self.timeline):
return return
timeline_object = self.timeline[self.timeline_index] timeline_object = self.timeline[self.timeline_index]
if hasattr(timeline_object, 'bpm') and timeline_object.hit_ms <= current_ms: if hasattr(timeline_object, 'bpm') and timeline_object.hit_ms <= current_ms:
self.bpm = timeline_object.bpm self.bpm = timeline_object.bpm
if self.timeline_index < len(self.timeline) - 1:
self.timeline_index += 1 self.timeline_index += 1
def animation_manager(self, animation_list: list, current_time: float): def animation_manager(self, animation_list: list, current_time: float):