mirror of
https://github.com/Yonokid/PyTaiko.git
synced 2026-02-04 11:40:13 +01:00
squashed remaining bugs
This commit is contained in:
17
libs/tja.py
17
libs/tja.py
@@ -427,11 +427,16 @@ class TJAParser:
|
||||
bar_length = sum(len(part) for part in bar if '#' not in part)
|
||||
barline_added = False
|
||||
for part in bar:
|
||||
if '#LYRIC' in part:
|
||||
continue
|
||||
if part.startswith('#BRANCHSTART'):
|
||||
skip_branch = True
|
||||
continue
|
||||
if part == '#M':
|
||||
skip_branch = False
|
||||
continue
|
||||
if skip_branch:
|
||||
continue
|
||||
if '#LYRIC' in part:
|
||||
continue
|
||||
if '#JPOSSCROLL' in part:
|
||||
continue
|
||||
elif '#NMSCROLL' in part:
|
||||
@@ -525,14 +530,9 @@ class TJAParser:
|
||||
elif '#GOGOEND' in part:
|
||||
gogo_time = False
|
||||
continue
|
||||
elif part.startswith('#M'):
|
||||
skip_branch = False
|
||||
continue
|
||||
#Unrecognized commands will be skipped for now
|
||||
elif len(part) > 0 and not part[0].isdigit():
|
||||
continue
|
||||
if skip_branch:
|
||||
continue
|
||||
|
||||
ms_per_measure = get_ms_per_measure(bpm, time_signature)
|
||||
|
||||
@@ -571,6 +571,9 @@ class TJAParser:
|
||||
if item == '0' or (not item.isdigit()):
|
||||
self.current_ms += increment
|
||||
continue
|
||||
if item == '9' and play_note_list and play_note_list[-1].type == 9:
|
||||
self.current_ms += increment
|
||||
continue
|
||||
note = Note()
|
||||
note.hit_ms = self.current_ms
|
||||
note.display = True
|
||||
|
||||
Reference in New Issue
Block a user