diff --git a/tja2fumen/converters.py b/tja2fumen/converters.py index cb896df..000a22e 100644 --- a/tja2fumen/converters.py +++ b/tja2fumen/converters.py @@ -64,7 +64,7 @@ def preprocessTJAMeasures(tja): # Step 2: Split measure into submeasure measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo, '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: if data['type'] == 'note': measure_cur['data'].append(data) @@ -79,7 +79,7 @@ def preprocessTJAMeasures(tja): measuresCorrected.append(measure_cur) measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo, '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': currentScroll = data['value'] measure_cur['scroll'] = currentScroll diff --git a/tja2fumen/parsers.py b/tja2fumen/parsers.py index ec8af49..38237f4 100644 --- a/tja2fumen/parsers.py +++ b/tja2fumen/parsers.py @@ -92,8 +92,6 @@ def getCourse(tjaHeaders, lines): headers['scoreInit'] = int(line['value']) elif line["name"] == 'SCOREDIFF': headers['scoreDiff'] = int(line['value']) - elif line["name"] == 'TTROWBEAT': - headers['ttRowBeat'] = int(line['value']) elif line["name"] == 'BALLOON': if line['value']: balloons = [int(v) for v in line['value'].split(",")] @@ -135,7 +133,7 @@ def getCourse(tjaHeaders, lines): flagLevelhold = False def parseMeasureCommands(line): - nonlocal measureDivisor, measureDividend, measureEvents, measureProperties, flagLevelhold + nonlocal measureDivisor, measureDividend, measureEvents, flagLevelhold if line['name'] == 'MEASURE': matchMeasure = re.match(r"(\d+)/(\d+)", line['value']) if not matchMeasure: @@ -154,27 +152,23 @@ def getCourse(tjaHeaders, lines): measureEvents.append({"name": 'scroll', "position": len(measureData), "value": float(line['value'])}) elif line['name'] == 'BPMCHANGE': measureEvents.append({"name": 'bpm', "position": len(measureData), "value": float(line['value'])}) - elif line['name'] == 'TTBREAK': - measureProperties['ttBreak'] = True elif line['name'] == 'LEVELHOLD': flagLevelhold = True def parseMeasureData(line): - nonlocal measures, measureData, measureDividend, measureDivisor, measureEvents, measureProperties + nonlocal measures, measureData, measureDividend, measureDivisor, measureEvents data = line['data'] # If measure has ended, then append the measure and start anew if data.endswith(','): measureData += data[0:-1] measure = { "length": [measureDividend, measureDivisor], - "properties": measureProperties, "data": measureData, "events": measureEvents, } measures.append(measure) measureData = '' measureEvents = [] - measureProperties = {} # Otherwise, keep tracking measureData else: measureData += data @@ -184,7 +178,6 @@ def getCourse(tjaHeaders, lines): measures = [] measureDividend = 4 measureDivisor = 4 - measureProperties = {} measureData = '' measureEvents = [] currentBranch = 'N' @@ -219,7 +212,6 @@ def getCourse(tjaHeaders, lines): if measureData: measures.append({ "length": [measureDividend, measureDivisor], - "properties": measureProperties, "data": measureData, "events": measureEvents, })