1
0
mirror of synced 2024-11-15 01:47:34 +01:00

Fix errors in ia6cho charts

The official fumen had some issues where a note ended up in the wrong measure:

- Expected: pos 0.0 on the next measure
- Actual: pos 645 on the prev measure (impossible pos)

They're the same pos, but only pos 0.0 is possible to express in TJA charts, so the fumens themselves had to be updated.

Also, the TJA chart had errors, too:

- The BPMs/SCROLLs in the BPMCHANGE section were incorrect
- Some drumrolls were too short

Fixing these errors caused the failing test to pass.
This commit is contained in:
Viv 2023-06-29 19:46:57 -04:00
parent ea701a5c63
commit 3e33d5c634
3 changed files with 94 additions and 65 deletions

View File

@ -1,5 +1,5 @@
BPM:186
OFFSET:-11.432
OFFSET:-11.430
COURSE:Edit
LEVEL:9
@ -107,22 +107,26 @@ SCOREDIFF:102
1122102012221020,
1122112211221122,
11111022,
110210201102
#BPMCHANGE 160
#SCROLL 1.1625
11021020
#BPMCHANGE 178
#SCROLL 1.04
1102
#BPMCHANGE 168
#SCROLL 1.11
1020,
#MEASURE 5/4
#BPMCHANGE 159
#SCROLL 1
11
#BPMCHANGE 142
#BPMCHANGE 144
11
#BPMCHANGE 125
#BPMCHANGE 126
33
#GOGOEND
#BPMCHANGE 115
#BPMCHANGE 107
33
#BPMCHANGE 59
#BPMCHANGE 60.61
00,
#GOGOSTART
@ -154,7 +158,7 @@ COURSE:Oni
LEVEL:9
BALLOON:
SCOREINIT:370
SCOREDIFF:80
SCOREDIFF:90
#START
@ -256,22 +260,26 @@ SCOREDIFF:80
1011221010001010,
2021202120212021,
2020101020002222,
101120101011
#BPMCHANGE 160
#SCROLL 1.1625
10112010
#BPMCHANGE 178
#SCROLL 1.04
1011
#BPMCHANGE 168
#SCROLL 1.11
2020,
#MEASURE 5/4
#BPMCHANGE 159
#SCROLL 1
11
#BPMCHANGE 142
#BPMCHANGE 144
21
#BPMCHANGE 125
#BPMCHANGE 126
33
#GOGOEND
#BPMCHANGE 115
#BPMCHANGE 107
33
#BPMCHANGE 59
#BPMCHANGE 60.61
00,
#GOGOSTART
@ -302,7 +310,7 @@ COURSE:Hard
LEVEL:7
BALLOON:11
SCOREINIT:450
SCOREDIFF:100
SCOREDIFF:117
#START
@ -404,23 +412,27 @@ SCOREDIFF:100
11102011,
1011101110111011,
11102011,
201120
#BPMCHANGE 160
#SCROLL 1.1625
2011
#BPMCHANGE 178
#SCROLL 1.04
20
#BPMCHANGE 168
#SCROLL 1.11
11,
#MEASURE 5/4
#BPMCHANGE 159
#SCROLL 1
70
#BPMCHANGE 142
00
#BPMCHANGE 125
00
70000000
#BPMCHANGE 144
00000000
#BPMCHANGE 126
00000000
#GOGOEND
#BPMCHANGE 115
00
#BPMCHANGE 59
80,
#BPMCHANGE 107
00000800
#BPMCHANGE 60.61
00000000,
#GOGOSTART
#MEASURE 2/4
@ -450,8 +462,8 @@ SCOREDIFF:100
COURSE:Normal
LEVEL:5
BALLOON:9,9
SCOREINIT:560
SCOREDIFF:120
SCOREINIT:570
SCOREDIFF:157
#START
@ -469,7 +481,7 @@ SCOREDIFF:120
10101110,
10101110,
6,
000000000000008000000000000000000000000000000000,
000000000000000008000000000000000000000000000000,
#GOGOEND
11,
@ -523,7 +535,7 @@ SCOREDIFF:120
1111,
10111000,
6,
000000000000000008000000000000000000000000000000,
000000000000000000000008000000000000000000000000,
11,
1110,
11,
@ -553,27 +565,36 @@ SCOREDIFF:120
10111000,
600000000000000000000000000000000008000000000000,
33304000,
101110
#BPMCHANGE 160
#SCROLL 1.1625
1011
#BPMCHANGE 178
#SCROLL 1.04
10
#BPMCHANGE 168
#SCROLL 1.11
10,
#MEASURE 5/4
#SCROLL 1
70
#BPMCHANGE 142
00
#BPMCHANGE 125
00
#BPMCHANGE 159
#SCROLL 1.17
70000000
#BPMCHANGE 144
#SCROLL 1.29
00000000
#BPMCHANGE 126
#SCROLL 1.49
00000000
#GOGOEND
#BPMCHANGE 115
00
#BPMCHANGE 59
80,
#BPMCHANGE 107
#SCROLL 1.74
00000800
#BPMCHANGE 60.61
#SCROLL 3.07
00000000,
#GOGOSTART
#MEASURE 2/4
#BPMCHANGE 186
#SCROLL 1
22,
#MEASURE 4/4
600000000000000000000000000000000008000000000000,
@ -585,7 +606,7 @@ SCOREDIFF:120
10201110,
10201110,
6,
000000000000008000000000000000000000000000000000,
000000000000000008000000000000000000000000000000,
9,
0
@ -599,8 +620,8 @@ SCOREDIFF:120
COURSE:Easy
LEVEL:3
BALLOON:5,7,6
SCOREINIT:500
SCOREDIFF:110
SCOREINIT:510
SCOREDIFF:155
#START
@ -618,7 +639,7 @@ SCOREDIFF:110
1110,
1110,
6,
000000000008000000000000000000000000000000000000,
000000000000000008000000000000000000000000000000,
#GOGOEND
1,
@ -702,27 +723,36 @@ SCOREDIFF:110
1110,
600000000000000000000000000008000000000000000000,
3330,
101
#BPMCHANGE 160
10
#BPMCHANGE 178
#SCROLL 1.04
1
#BPMCHANGE 168
#SCROLL 1.1625
0,
#MEASURE 5/4
#SCROLL 1
70
#BPMCHANGE 142
00
#BPMCHANGE 125
00
#BPMCHANGE 159
#SCROLL 1.17
70000000
#BPMCHANGE 144
#SCROLL 1.29
00000000
#BPMCHANGE 126
#SCROLL 1.49
00000000
#GOGOEND
#BPMCHANGE 115
00
#BPMCHANGE 59
80,
#BPMCHANGE 107
#SCROLL 1.74
00000800
#BPMCHANGE 60.61
#SCROLL 3.07
00000000,
#GOGOSTART
#MEASURE 2/4
#BPMCHANGE 186
#SCROLL 1
,
#MEASURE 4/4
600000000000000000000000000008000000000000000000,
@ -734,7 +764,7 @@ SCOREDIFF:110
1110,
1110,
6,
000000000008000000000000000000000000000000000000,
000000000000000008000000000000000000000000000000,
9,
0
#GOGOEND

Binary file not shown.

View File

@ -15,8 +15,7 @@ from src.tja2fumen.constants import COURSE_IDS, NORMALIZE_COURSE, simpleHeaders,
# Passing charts
pytest.param('mikdp'),
# Failing charts (NB: These will be XFAIL in CI, but FAIL in local tests.)
pytest.param('ia6cho', marks=pytest.mark.xfail("CI" in os.environ, raises=AssertionError,
reason='Fumen has several inexplicable empty measures at start.')),
pytest.param('ia6cho'),
])
def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point):
# Define the testing directory