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

tja2fumen.py: Switch to a measures sub-dictionary

Browse Source 
This makes the `song` object a lot easier to navigate when
inspecting variables through a debugger.
This commit is contained in:
Viv 2023-06-02 16:33:43 -04:00
parent b7670b54a3
commit fdc3b6e1af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tja2fumen/tja2fumen.py
View File

@ -115,7 +115,7 @@ def readFumen(fumenFile, byteOrder=None, debug=False):
unknownMetadata = readStruct(file, order, format_string="I", seek=0x204)[0] unknownMetadata = readStruct(file, order, format_string="I", seek=0x204)[0]
# Initialize the dict that will contain the chart information # Initialize the dict that will contain the chart information
song = {} song = { 'measures': [] }
song['header'] = fumenHeader song['header'] = fumenHeader
song['headerUnknown'] = fumenHeaderUnknown song['headerUnknown'] = fumenHeaderUnknown
song['order'] = order song['order'] = order
@ -155,7 +155,7 @@ def readFumen(fumenFile, byteOrder=None, debug=False):
if measureNumber == 0: if measureNumber == 0:
measure["offset"] = measure["fumenOffset"] + 240000 / measure["bpm"] measure["offset"] = measure["fumenOffset"] + 240000 / measure["bpm"]
else: else:
prev = song[measureNumber - 1] prev = song['measures'][measureNumber - 1]
measure["offset"] = ((prev["offset"] + measure["fumenOffset"] + 240000) / measure["offset"] = ((prev["offset"] + measure["fumenOffset"] + 240000) /
(measure["bpm"] - prev["fumenOffset"] - 240000 / prev["bpm"])) (measure["bpm"] - prev["fumenOffset"] - 240000 / prev["bpm"]))
measure["gogo"] = getBool(measureStruct[2]) measure["gogo"] = getBool(measureStruct[2])
@ -263,7 +263,7 @@ def readFumen(fumenFile, byteOrder=None, debug=False):
measure[branchNames[branchNumber]] = branch measure[branchNames[branchNumber]] = branch
# Assign the measure to the song # Assign the measure to the song
song[measureNumber] = measure song['measures'].append(measure)
if file.tell() >= size: if file.tell() >= size:
break break
@ -318,7 +318,7 @@ def writeFumen(file, song):
len_measures = 0 len_measures = 0
for measureNumber in range(song['length']): for measureNumber in range(song['length']):
len_measures += 40 len_measures += 40
measure = song[measureNumber] measure = song['measures'][measureNumber]
for branchNumber in range(len(branchNames)): for branchNumber in range(len(branchNames)):
len_measures += 8 len_measures += 8
branch = measure[branchNames[branchNumber]] branch = measure[branchNames[branchNumber]]
@ -337,7 +337,7 @@ def writeFumen(file, song):
# Write measure data # Write measure data
file.seek(0x208) file.seek(0x208)
for measureNumber in range(song['length']): for measureNumber in range(song['length']):
measure = song[measureNumber] measure = song['measures'][measureNumber]
measureStruct = [measure['bpm'], measure['fumenOffset'], int(measure['gogo']), int(measure['hidden'])] measureStruct = [measure['bpm'], measure['fumenOffset'], int(measure['gogo']), int(measure['hidden'])]
measureStruct.extend([measure['padding1']] + measure['branchInfo'] + [measure['padding2']]) measureStruct.extend([measure['padding1']] + measure['branchInfo'] + [measure['padding2']])
writeStruct(file, order, format_string="ffBBHiiiiiii", value_list=measureStruct) writeStruct(file, order, format_string="ffBBHiiiiiii", value_list=measureStruct)