From b76755775c385f51fd36447e2cf0a66f554c9d8e Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Sun, 23 Mar 2025 14:05:40 -0700 Subject: fix mai2 score calculation, add checks for plus variants of lamp --- mai2/aquadx/mai_aquadx_to_tachi.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mai2') diff --git a/mai2/aquadx/mai_aquadx_to_tachi.py b/mai2/aquadx/mai_aquadx_to_tachi.py index deb5262..415b576 100644 --- a/mai2/aquadx/mai_aquadx_to_tachi.py +++ b/mai2/aquadx/mai_aquadx_to_tachi.py @@ -46,16 +46,20 @@ def convert_from_aquadx_json_to_tachi_json(input_json: str, output_file: str, se processed_count += 1 song_title = music_json[str(entry["musicId"])]["name"] - raw_score_value = str(entry.get("achievement", 0)) - score_value = float(f"{raw_score_value[:2]}.{raw_score_value[2]}") + raw_score_value = entry.get("achievement", 0) + score_value = float(raw_score_value/10000) is_clear = entry.get("isClear", False) is_full_combo = entry.get("isFullCombo", False) is_all_perfect = entry.get("isAllPerfect", False) lamp = "FAILED" if is_all_perfect: lamp = "ALL PERFECT" + if entry.get("tapGreat") == 0: + lamp == "ALL PERFECT+" elif is_full_combo: lamp = "FULL COMBO" + if entry.get("tapGood") == 0: + lamp = "FULL COMBO+" elif is_clear: lamp = "CLEAR" timestamp = entry.get("loginDate", None) -- cgit v1.2.3