Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2024-11-27 22:40:49 +01:00
Code Releases Wiki Activity

WIP: balloon find/replace

Browse Source
This commit is contained in:
Viv 2024-10-26 10:36:05 -04:00
parent 34428bbbe7
commit 0590f52a76
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tja2fumen/parsers.py
View File

@ -234,12 +234,16 @@ def parse_tja_course_data(data: List[str]) -> Dict[str, List[TJAMeasure]]:
parsed_branches[current_branch][idx_m].notes += note_data[:-1] parsed_branches[current_branch][idx_m].notes += note_data[:-1]
parsed_branches[current_branch].append(TJAMeasure()) parsed_branches[current_branch].append(TJAMeasure())
# Repeat steps for other branches if we only have info for a single branch # Repeat steps for other branches if we only have info for a single branch
# (Note: We replace balloons with drumrolls to avoid reading from BALLOON:
# field extra times)
if add_dummy_notes_to_other_branches: if add_dummy_notes_to_other_branches:
other_branches = list(set(BRANCH_NAMES) - set([current_branch])) other_branches = list(set(BRANCH_NAMES) - set([current_branch]))
for branch_name in other_branches: for branch_name in other_branches:
check_branch_length(parsed_branches, branch_name, check_branch_length(parsed_branches, branch_name,
expected_len=idx_m+1) expected_len=idx_m+1)
dummy_data = note_data[:-1] dummy_data = note_data[:-1]
dummy_data = dummy_data.replace('7', '5') # Balloon -> Drumroll
dummy_data = dummy_data.replace('9', '5') # Kusudama -> Drumroll
parsed_branches[branch_name][idx_m].notes += dummy_data parsed_branches[branch_name][idx_m].notes += dummy_data
parsed_branches[branch_name].append(TJAMeasure()) parsed_branches[branch_name].append(TJAMeasure())
idx_m += 1 idx_m += 1
@ -247,10 +251,14 @@ def parse_tja_course_data(data: List[str]) -> Dict[str, List[TJAMeasure]]:
else: else:
parsed_branches[current_branch][idx_m].notes += note_data parsed_branches[current_branch][idx_m].notes += note_data
# Repeat steps for other branches if we only have info for a single branch # Repeat steps for other branches if we only have info for a single branch
# (Note: We replace balloons with drumrolls to avoid reading from BALLOON:
# field extra times)
if add_dummy_notes_to_other_branches: if add_dummy_notes_to_other_branches:
other_branches = list(set(BRANCH_NAMES) - set([current_branch])) other_branches = list(set(BRANCH_NAMES) - set([current_branch]))
for branch_name in other_branches: for branch_name in other_branches:
dummy_data = note_data dummy_data = note_data
dummy_data = dummy_data.replace('7', '5') # Balloon -> Drumroll
dummy_data = dummy_data.replace('9', '5') # Kusudama -> Drumroll
parsed_branches[branch_name][idx_m].notes += dummy_data parsed_branches[branch_name][idx_m].notes += dummy_data
# 2. Parse measure commands that produce an "event" # 2. Parse measure commands that produce an "event"

17
testing/test_conversion.py
View File

@ -149,6 +149,15 @@ def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point):
for i_note in range(max([co_branch.length, ca_branch.length])): for i_note in range(max([co_branch.length, ca_branch.length])):
co_note = co_branch.notes[i_note] co_note = co_branch.notes[i_note]
ca_note = ca_branch.notes[i_note] ca_note = ca_branch.notes[i_note]
# Check for "balloon deduplication" workaround.
# This is a hack I specifically added to account
# for songs where a balloon note occurs on the
# normal branch and gets copied to other branches.
# See PR #80 for more information.
if (ca_note.note_type in ['Balloon', 'Kusudama']
and co_note.note_type == 'Drumroll'):
pass
else:
check(co_note, ca_note, 'note_type', i_measure, check(co_note, ca_note, 'note_type', i_measure,
i_branch, i_note, func=normalize_type) i_branch, i_note, func=normalize_type)
check(co_note, ca_note, 'pos', i_measure, check(co_note, ca_note, 'pos', i_measure,
@ -167,6 +176,14 @@ def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point):
except AssertionError: except AssertionError:
pass pass
if ca_note.note_type in ["Balloon", "Kusudama"]: if ca_note.note_type in ["Balloon", "Kusudama"]:
# Check for "balloon deduplication" workaround.
# This is a hack I specifically added to account
# for songs where a balloon note occurs on the
# normal branch and gets copied to other branches.
# See PR #80 for more information.
if co_note.note_type == 'Drumroll':
pass
else:
check(co_note, ca_note, 'hits', i_measure, check(co_note, ca_note, 'hits', i_measure,
i_branch, i_note) i_branch, i_note)
else: else: