diff --git a/README.md b/README.md index 1e11609..397ef85 100644 --- a/README.md +++ b/README.md @@ -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,`
`9008,` | `⚪️` | `❔` | Double Kusudama note to reset accuracy. | | `#START`, `#END` | `✅` | `✅` | | | `#START P1`, `START P2` | `✅` | `❔` | | diff --git a/src/tja2fumen/constants.py b/src/tja2fumen/constants.py index d67f4b3..d660dd8 100644 --- a/src/tja2fumen/constants.py +++ b/src/tja2fumen/constants.py @@ -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 = { diff --git a/src/tja2fumen/parsers.py b/src/tja2fumen/parsers.py index 0049bdd..4d98c0f 100644 --- a/src/tja2fumen/parsers.py +++ b/src/tja2fumen/parsers.py @@ -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: diff --git a/testing/data/dummy_tjas/notes_sim_only.tja b/testing/data/dummy_tjas/notes_sim_only.tja new file mode 100644 index 0000000..dc44c72 --- /dev/null +++ b/testing/data/dummy_tjas/notes_sim_only.tja @@ -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 diff --git a/testing/test_command_support.py b/testing/test_command_support.py index fb4d217..b6479da 100644 --- a/testing/test_command_support.py +++ b/testing/test_command_support.py @@ -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:"],