From e3d2f0f03921c7e855e8299ed10d3f4ed53fc9b8 Mon Sep 17 00:00:00 2001 From: Viv Date: Fri, 2 Jun 2023 16:33:47 -0400 Subject: [PATCH] Prepare for testing against Unlimited Games --- tja2fumen/converters.py | 1 - tja2fumen/parsers.py | 2 +- tja2fumen/tja2fumen.py | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tja2fumen/converters.py b/tja2fumen/converters.py index 000a22e..6569c51 100644 --- a/tja2fumen/converters.py +++ b/tja2fumen/converters.py @@ -99,7 +99,6 @@ def preprocessTJAMeasures(tja): def convertTJAToFumen(fumen, tja): # Hardcode currentBranch due to current lack of support for branching songs currentBranch = 'normal' # TODO: Program in branch support - fumen['measures'] = fumen['measures'][9:] tja['measures'] = preprocessTJAMeasures(tja) # Parse TJA measures to create converted TJA -> Fumen file diff --git a/tja2fumen/parsers.py b/tja2fumen/parsers.py index 5448a21..189a03c 100644 --- a/tja2fumen/parsers.py +++ b/tja2fumen/parsers.py @@ -282,7 +282,7 @@ def readFumen(fumenFile, byteOrder=None, debug=False): debugPrint(f"Invalid header!") # Read the next 80 bytes, which contains unknown information fumenHeaderUnknown = file.read(80) - validateHeaderMetadata(fumenHeaderUnknown) + # validateHeaderMetadata(fumenHeaderUnknown) # Determine: # - The byte order (big or little endian) diff --git a/tja2fumen/tja2fumen.py b/tja2fumen/tja2fumen.py index 5d8076f..06035d0 100644 --- a/tja2fumen/tja2fumen.py +++ b/tja2fumen/tja2fumen.py @@ -39,6 +39,6 @@ def main(fnameFumen=None, fnameTJA=None, validate=False): if __name__ == "__main__": - fnameFumen = "test-data/ia6cho_m.bin" # NB: Contains only oni chart - fnameTJA = "test-data/Rokuchounen to Ichiya Monogatari.tja" # NB: Contains 5 charts - fumen, tja = main(fnameFumen, fnameTJA) + fnameFumen = "test-data/12373714_m.bin" + fnameTJA = "test-data/Unlimited Games.tja" # NB: Contains 5 charts + fumen, tja = main(fnameFumen=fnameFumen, fnameTJA=fnameTJA)