Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2024-11-30 23:57:16 +01:00
Code Releases Wiki Activity

Rename advanced -> professional

Browse Source
This commit is contained in:
Viv 2023-07-19 23:45:59 -04:00
parent 1bf83d09dc
commit 5ce313ca83
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tja2fumen/constants.py
View File

@ -43,7 +43,7 @@ FUMEN_NOTE_TYPES = {
} }
FUMEN_TYPE_NOTES = {v: k for k, v in FUMEN_NOTE_TYPES.items()} FUMEN_TYPE_NOTES = {v: k for k, v in FUMEN_NOTE_TYPES.items()}
BRANCH_NAMES = ("normal", "advanced", "master") BRANCH_NAMES = ("normal", "professional", "master")
TJA_COURSE_NAMES = [] TJA_COURSE_NAMES = []
for difficulty in ['Ura', 'Oni', 'Hard', 'Normal', 'Easy']: for difficulty in ['Ura', 'Oni', 'Hard', 'Normal', 'Easy']:

12
src/tja2fumen/converters.py
View File

@ -122,7 +122,7 @@ def convert_tja_to_fumen(tja):
) )
# Iterate through the different branches in the TJA # Iterate through the different branches in the TJA
total_notes = {'normal': 0, 'advanced': 0, 'master': 0} total_notes = {'normal': 0, 'professional': 0, 'master': 0}
for current_branch, branch_measures_tja_processed in processed_tja_branches.items(): for current_branch, branch_measures_tja_processed in processed_tja_branches.items():
if not len(branch_measures_tja_processed): if not len(branch_measures_tja_processed):
continue continue
@ -218,7 +218,7 @@ def convert_tja_to_fumen(tja):
vals.append(0) vals.append(0)
if current_branch == 'normal': if current_branch == 'normal':
measure_fumen.branch_info[0:2] = vals measure_fumen.branch_info[0:2] = vals
elif current_branch == 'advanced': elif current_branch == 'professional':
measure_fumen.branch_info[2:4] = vals measure_fumen.branch_info[2:4] = vals
elif current_branch == 'master': elif current_branch == 'master':
measure_fumen.branch_info[4:6] = vals measure_fumen.branch_info[4:6] = vals
@ -239,7 +239,7 @@ def convert_tja_to_fumen(tja):
measure_fumen.branch_info[0:2] = (branch_condition[1:] if measure_tja_processed.section or measure_fumen.branch_info[0:2] = (branch_condition[1:] if measure_tja_processed.section or
not measure_tja_processed.section and not branch_conditions not measure_tja_processed.section and not branch_conditions
else [999, 999]) else [999, 999])
elif current_branch == 'advanced': elif current_branch == 'professional':
measure_fumen.branch_info[2:4] = branch_condition[1:] measure_fumen.branch_info[2:4] = branch_condition[1:]
elif current_branch == 'master': elif current_branch == 'master':
measure_fumen.branch_info[4:6] = (branch_condition[1:] if measure_tja_processed.section or measure_fumen.branch_info[4:6] = (branch_condition[1:] if measure_tja_processed.section or
@ -331,9 +331,9 @@ def convert_tja_to_fumen(tja):
fumen.header.b496_b499_branch_points_balloon = 0 fumen.header.b496_b499_branch_points_balloon = 0
fumen.header.b500_b503_branch_points_kusudama = 0 fumen.header.b500_b503_branch_points_kusudama = 0
# Compute the ratio between normal and advanced/master branches (just in case the note counts differ) # Compute the ratio between normal and professional/master branches (just in case the note counts differ)
if total_notes['advanced']: if total_notes['professional']:
fumen.header.b460_b463_normal_professional_ratio = int(65536 * (total_notes['normal'] / total_notes['advanced'])) fumen.header.b460_b463_normal_professional_ratio = int(65536 * (total_notes['normal'] / total_notes['professional']))
if total_notes['master']: if total_notes['master']:
fumen.header.b464_b467_normal_master_ratio = int(65536 * (total_notes['normal'] / total_notes['master'])) fumen.header.b464_b467_normal_master_ratio = int(65536 * (total_notes['normal'] / total_notes['master']))

4
src/tja2fumen/parsers.py
View File

@ -197,7 +197,7 @@ def parse_course_measures(course):
current_branch = 'normal' current_branch = 'normal'
idx_m = idx_m_branchstart idx_m = idx_m_branchstart
elif line.name == 'E': elif line.name == 'E':
current_branch = 'advanced' current_branch = 'professional'
idx_m = idx_m_branchstart idx_m = idx_m_branchstart
elif line.name == 'M': elif line.name == 'M':
current_branch = 'master' current_branch = 'master'
@ -365,6 +365,6 @@ def read_fumen(fumen_file, exclude_empty_measures=False):
# a converted non-official TJA, then it's useful to exclude the empty measures. # a converted non-official TJA, then it's useful to exclude the empty measures.
if exclude_empty_measures: if exclude_empty_measures:
song.measures = [m for m in song.measures song.measures = [m for m in song.measures
if m.branches['normal'].length or m.branches['advanced'].length or m.branches['master'].length] if m.branches['normal'].length or m.branches['professional'].length or m.branches['master'].length]
return song return song

4
src/tja2fumen/types.py
View File

@ -27,7 +27,7 @@ class TJACourse:
self.data = [] self.data = []
self.branches = { self.branches = {
'normal': [TJAMeasure()], 'normal': [TJAMeasure()],
'advanced': [TJAMeasure()], 'professional': [TJAMeasure()],
'master': [TJAMeasure()] 'master': [TJAMeasure()]
} }
@ -100,7 +100,7 @@ class FumenMeasure:
self.barline = barline self.barline = barline
self.branch_start = branch_start self.branch_start = branch_start
self.branch_info = [-1, -1, -1, -1, -1, -1] if branch_info is None else branch_info self.branch_info = [-1, -1, -1, -1, -1, -1] if branch_info is None else branch_info
self.branches = {'normal': FumenBranch(), 'advanced': FumenBranch(), 'master': FumenBranch()} self.branches = {'normal': FumenBranch(), 'professional': FumenBranch(), 'master': FumenBranch()}
self.padding1 = padding1 self.padding1 = padding1
self.padding2 = padding2 self.padding2 = padding2

2
testing/test_conversion.py
View File

@ -120,7 +120,7 @@ def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point):
assert_song_property(co_measure, ca_measure, 'branch_info', i_measure) assert_song_property(co_measure, ca_measure, 'branch_info', i_measure)
# 3b. Check measure notes # 3b. Check measure notes
for i_branch in ['normal', 'advanced', 'master']: for i_branch in ['normal', 'professional', 'master']:
co_branch = co_measure.branches[i_branch] co_branch = co_measure.branches[i_branch]
ca_branch = ca_measure.branches[i_branch] ca_branch = ca_measure.branches[i_branch]
# NB: We only check speed for non-empty branches, as fumens store speed changes even for empty branches # NB: We only check speed for non-empty branches, as fumens store speed changes even for empty branches