Add semi-support for sim-specific notes
This commit is contained in:
parent
f1cd73ebb9
commit
276bd0b70c
@ -63,7 +63,7 @@ If there is an unsupported feature that you would like support for, please make
|
||||
|-------------------------------------------------|-----------|---------|----------------------------------------------------------------------|
|
||||
| `0`, `1`, `2`, `3`, `4` `5`, `6`, `7`, `8`, `9` | `✅` | `✅` | |
|
||||
| `A`, `B` | `✅` | `❌` | |
|
||||
| `F` | `❔` | `❔` | Hidden ADLIB note. |
|
||||
| `C`, `D`, `E`, `F`, `G`, `H`, `I` | `⚠️` | `❌` | Replaced by normal notes/rolls in tja2fumen. |
|
||||
| `9000,`<br>`9008,` | `⚪️` | `❔` | Double Kusudama note to reset accuracy. |
|
||||
| `#START`, `#END` | `✅` | `✅` | |
|
||||
| `#START P1`, `START P2` | `✅` | `❔` | |
|
||||
|
@ -1,4 +1,5 @@
|
||||
TJA_NOTE_TYPES = {
|
||||
'0': 'Blank',
|
||||
'1': 'Don',
|
||||
'2': 'Ka',
|
||||
'3': 'DON',
|
||||
@ -8,8 +9,15 @@ TJA_NOTE_TYPES = {
|
||||
'7': 'Balloon',
|
||||
'8': 'EndDRB',
|
||||
'9': 'Kusudama',
|
||||
'A': 'DON2', # hands
|
||||
'B': 'KA2', # hands
|
||||
'A': 'DON2', # hands
|
||||
'B': 'KA2', # hands
|
||||
'C': 'Blank', # bombs
|
||||
'D': 'Drumroll', # fuse roll
|
||||
'E': 'DON2', # red + green single hit
|
||||
'F': 'Ka', # ADLib (hidden note)
|
||||
'G': 'KA2', # red + green double hit
|
||||
'H': 'DRUMROLL', # double roll
|
||||
'I': 'Drumroll', # green roll
|
||||
}
|
||||
|
||||
FUMEN_NOTE_TYPES = {
|
||||
|
@ -249,7 +249,8 @@ def parse_tja_course_data(course):
|
||||
for branch_name, branch in course.branches.items():
|
||||
for measure in branch:
|
||||
notes = [TJAData('note', TJA_NOTE_TYPES[note], i)
|
||||
for i, note in enumerate(measure.notes) if note != '0']
|
||||
for i, note in enumerate(measure.notes) if
|
||||
TJA_NOTE_TYPES[note] != 'Blank']
|
||||
events = measure.events
|
||||
while notes or events:
|
||||
if events and notes:
|
||||
|
19
testing/data/dummy_tjas/notes_sim_only.tja
Normal file
19
testing/data/dummy_tjas/notes_sim_only.tja
Normal file
@ -0,0 +1,19 @@
|
||||
// This song contains only basic notes.
|
||||
BPM:120
|
||||
OFFSET:-1.00
|
||||
|
||||
COURSE:Oni
|
||||
LEVEL:10
|
||||
BALLOON:8,8
|
||||
SCOREINIT:400
|
||||
SCOREDIFF:100
|
||||
|
||||
#START
|
||||
C0C0,
|
||||
D008,
|
||||
E0E0,
|
||||
F0F0,
|
||||
G0G0,
|
||||
H008,
|
||||
I008,
|
||||
#END
|
@ -9,6 +9,7 @@ from conftest import convert
|
||||
@pytest.mark.parametrize('id_song,err_msg', [
|
||||
['basic_song', None],
|
||||
['notes_hands', None],
|
||||
['notes_sim_only', None],
|
||||
['missing_score', None],
|
||||
['missing_balloon', "Not enough values for 'BALLOON:"],
|
||||
['missing_course', "Invalid COURSE value:"],
|
||||
|
Loading…
Reference in New Issue
Block a user