Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2025-02-03 13:13:26 +01:00
Code Releases Wiki Activity

Remove TTBREAK, TTROWBEAT, and measureProperties

Browse Source 
These are unnecessary; these commands are not included in the TJA spec.
This commit is contained in:
Viv 2023-06-02 16:33:47 -04:00
parent 1d3490c600
commit b3968bc365
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tja2fumen/converters.py
View File

@ -64,7 +64,7 @@ def preprocessTJAMeasures(tja):
# Step 2: Split measure into submeasure # Step 2: Split measure into submeasure
measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo, measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo,
'subdivisions': len(measure['data']), 'pos_start': 0, 'pos_end': 0, 'subdivisions': len(measure['data']), 'pos_start': 0, 'pos_end': 0,
'time_sig': measure['length'], 'data': [], 'properties': measure['properties']} 'time_sig': measure['length'], 'data': []}
for data in combined: for data in combined:
if data['type'] == 'note': if data['type'] == 'note':
measure_cur['data'].append(data) measure_cur['data'].append(data)
@ -79,7 +79,7 @@ def preprocessTJAMeasures(tja):
measuresCorrected.append(measure_cur) measuresCorrected.append(measure_cur)
measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo, measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo,
'subdivisions': len(measure['data']), 'pos_start': data['pos'], 'pos_end': 0, 'subdivisions': len(measure['data']), 'pos_start': data['pos'], 'pos_end': 0,
'time_sig': measure['length'], 'data': [], 'properties': measure['properties']} 'time_sig': measure['length'], 'data': []}
elif data['type'] == 'scroll': elif data['type'] == 'scroll':
currentScroll = data['value'] currentScroll = data['value']
measure_cur['scroll'] = currentScroll measure_cur['scroll'] = currentScroll

12
tja2fumen/parsers.py
View File

@ -92,8 +92,6 @@ def getCourse(tjaHeaders, lines):
headers['scoreInit'] = int(line['value']) headers['scoreInit'] = int(line['value'])
elif line["name"] == 'SCOREDIFF': elif line["name"] == 'SCOREDIFF':
headers['scoreDiff'] = int(line['value']) headers['scoreDiff'] = int(line['value'])
elif line["name"] == 'TTROWBEAT':
headers['ttRowBeat'] = int(line['value'])
elif line["name"] == 'BALLOON': elif line["name"] == 'BALLOON':
if line['value']: if line['value']:
balloons = [int(v) for v in line['value'].split(",")] balloons = [int(v) for v in line['value'].split(",")]
@ -135,7 +133,7 @@ def getCourse(tjaHeaders, lines):
flagLevelhold = False flagLevelhold = False
def parseMeasureCommands(line): def parseMeasureCommands(line):
nonlocal measureDivisor, measureDividend, measureEvents, measureProperties, flagLevelhold nonlocal measureDivisor, measureDividend, measureEvents, flagLevelhold
if line['name'] == 'MEASURE': if line['name'] == 'MEASURE':
matchMeasure = re.match(r"(\d+)/(\d+)", line['value']) matchMeasure = re.match(r"(\d+)/(\d+)", line['value'])
if not matchMeasure: if not matchMeasure:
@ -154,27 +152,23 @@ def getCourse(tjaHeaders, lines):
measureEvents.append({"name": 'scroll', "position": len(measureData), "value": float(line['value'])}) measureEvents.append({"name": 'scroll', "position": len(measureData), "value": float(line['value'])})
elif line['name'] == 'BPMCHANGE': elif line['name'] == 'BPMCHANGE':
measureEvents.append({"name": 'bpm', "position": len(measureData), "value": float(line['value'])}) measureEvents.append({"name": 'bpm', "position": len(measureData), "value": float(line['value'])})
elif line['name'] == 'TTBREAK':
measureProperties['ttBreak'] = True
elif line['name'] == 'LEVELHOLD': elif line['name'] == 'LEVELHOLD':
flagLevelhold = True flagLevelhold = True
def parseMeasureData(line): def parseMeasureData(line):
nonlocal measures, measureData, measureDividend, measureDivisor, measureEvents, measureProperties nonlocal measures, measureData, measureDividend, measureDivisor, measureEvents
data = line['data'] data = line['data']
# If measure has ended, then append the measure and start anew # If measure has ended, then append the measure and start anew
if data.endswith(','): if data.endswith(','):
measureData += data[0:-1] measureData += data[0:-1]
measure = { measure = {
"length": [measureDividend, measureDivisor], "length": [measureDividend, measureDivisor],
"properties": measureProperties,
"data": measureData, "data": measureData,
"events": measureEvents, "events": measureEvents,
} }
measures.append(measure) measures.append(measure)
measureData = '' measureData = ''
measureEvents = [] measureEvents = []
measureProperties = {}
# Otherwise, keep tracking measureData # Otherwise, keep tracking measureData
else: else:
measureData += data measureData += data
@ -184,7 +178,6 @@ def getCourse(tjaHeaders, lines):
measures = [] measures = []
measureDividend = 4 measureDividend = 4
measureDivisor = 4 measureDivisor = 4
measureProperties = {}
measureData = '' measureData = ''
measureEvents = [] measureEvents = []
currentBranch = 'N' currentBranch = 'N'
@ -219,7 +212,6 @@ def getCourse(tjaHeaders, lines):
if measureData: if measureData:
measures.append({ measures.append({
"length": [measureDividend, measureDivisor], "length": [measureDividend, measureDivisor],
"properties": measureProperties,
"data": measureData, "data": measureData,
"events": measureEvents, "events": measureEvents,
}) })