From 9e8642ebd5d14cf3d845d43453b38a247ff6cddd Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 5 May 2025 17:46:59 -0700 Subject: aquadx_chuni: seperate note and clear lamp --- chuni/aquadx/chuni_aquadx_to_tachi.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/chuni/aquadx/chuni_aquadx_to_tachi.py b/chuni/aquadx/chuni_aquadx_to_tachi.py index 4a7455e..402f5fd 100644 --- a/chuni/aquadx/chuni_aquadx_to_tachi.py +++ b/chuni/aquadx/chuni_aquadx_to_tachi.py @@ -45,15 +45,16 @@ def convert_from_aquadx_json_to_tachi_json(raw_data: str, output_file: str, serv is_full_combo = entry.get("isFullCombo", False) is_all_justice = entry.get("isAllJustice", False) is_all_perfect = entry.get("isAllPerfect", False) - lamp = "FAILED" + note_lamp = "NONE" + clear_lamp = "FAILED" # AquaNet doesn't export other clear lamps? if is_all_perfect: - lamp = "ALL JUSTICE CRITICAL" + note_lamp = "ALL JUSTICE CRITICAL" elif is_all_justice: - lamp = "ALL JUSTICE" + note_lamp = "ALL JUSTICE" elif is_full_combo: - lamp = "FULL COMBO" + note_lamp = "FULL COMBO" elif is_clear: - lamp = "CLEAR" + clear_lamp = "CLEAR" timestamp = entry.get("sortNumber", None) jcrit = entry.get("judgeHeaven", 0) + entry.get("judgeCritical", 0) @@ -64,7 +65,8 @@ def convert_from_aquadx_json_to_tachi_json(raw_data: str, output_file: str, serv score_entry = { "score": score_value, - "lamp": lamp, + "noteLamp": note_lamp, + "clearLamp": clear_lamp, "matchType": "inGameID", "identifier": str(music_id), "difficulty": DIFFICULTY_MAPPING[level], -- cgit v1.2.3