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

fix drumrolls over branches

Browse Source
This commit is contained in:
Anthony Samms
2025-10-27 00:28:38 -04:00
parent 2674633988
commit 3afa9db5ac
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/song_hash.py
View File

@@ -141,7 +141,6 @@ def build_song_hashes(output_dir=Path("cache")):
continue continue
if all_notes == NoteList(): if all_notes == NoteList():
print(tja_path)
continue continue
hash_val = tja.hash_note_data(all_notes) hash_val = tja.hash_note_data(all_notes)

15
libs/tja.py
View File

@@ -808,12 +808,23 @@ class TJAParser:
note = Balloon(note) note = Balloon(note)
note.count = 1 if not balloon else balloon.pop(0) note.count = 1 if not balloon else balloon.pop(0)
elif item == '8': elif item == '8':
new_pixels_per_ms = curr_note_list[-1].pixels_per_frame_x / (1000 / 60) if not curr_note_list or curr_note_list[-1].type not in {5, 6, 7, 9}:
if master_notes.play_notes and master_notes.play_notes[-1].type in {5, 6, 7, 9}:
prev_note = master_notes.play_notes[-1]
elif branch_m[-1].play_notes and branch_m[-1].play_notes[-1].type in {5, 6, 7, 9}:
prev_note = branch_m[-1].play_notes[-1]
elif branch_e[-1].play_notes and branch_e[-1].play_notes[-1].type in {5, 6, 7, 9}:
prev_note = branch_e[-1].play_notes[-1]
elif branch_n[-1].play_notes and branch_n[-1].play_notes[-1].type in {5, 6, 7, 9}:
prev_note = branch_n[-1].play_notes[-1]
else:
prev_note = curr_note_list[-1]
new_pixels_per_ms = prev_note.pixels_per_frame_x / (1000 / 60)
if new_pixels_per_ms == 0: if new_pixels_per_ms == 0:
note.load_ms = note.hit_ms note.load_ms = note.hit_ms
else: else:
note.load_ms = note.hit_ms - (self.distance / new_pixels_per_ms) note.load_ms = note.hit_ms - (self.distance / new_pixels_per_ms)
note.pixels_per_frame_x = curr_note_list[-1].pixels_per_frame_x note.pixels_per_frame_x = prev_note.pixels_per_frame_x
self.current_ms += increment self.current_ms += increment
curr_note_list.append(note) curr_note_list.append(note)
bisect.insort(curr_draw_list, note, key=lambda x: x.load_ms) bisect.insort(curr_draw_list, note, key=lambda x: x.load_ms)