From 1a3216a5fe5beccfa3cd9be43998d24b0c75c65c Mon Sep 17 00:00:00 2001
From: drmext <71258889+drmext@users.noreply.github.com>
Date: Wed, 4 Jan 2023 07:13:45 +0000
Subject: [PATCH] Fix GITADORA saving

---
 modules/gitadora/gameend.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/gitadora/gameend.py b/modules/gitadora/gameend.py
index cbd32b7..9cc967b 100644
--- a/modules/gitadora/gameend.py
+++ b/modules/gitadora/gameend.py
@@ -32,10 +32,14 @@ async def gitadora_gameend_regist(ver: str, request: Request):
 
     root = request_info["root"][0]
 
-    player = root.find("player")
-    no = int(player.attrib["no"])
+    players = root.findall("player")
+
+    for player in players:
+        no = int(player.attrib["no"])
+
+        if player.attrib["card"] != "use":
+            continue
 
-    if player.attrib["card"] == "use":
         dataid = player.find("refid").text
         profile = get_profile(dataid)
         gitadora_id = profile["gitadora_id"]
@@ -292,7 +296,7 @@ async def gitadora_gameend_regist(ver: str, request: Request):
             )
             best_score = {} if best_score is None else best_score
 
-            best_ex_score = best_score.get("score", score)
+            best_perc = best_score.get("perc", perc)
             best_score_data = {
                 "gitadora_id": gitadora_id,
                 "musicid": musicid,
@@ -304,10 +308,10 @@ async def gitadora_gameend_regist(ver: str, request: Request):
                 "perc": max(perc, best_score.get("perc", perc)),
                 "rank": max(rank, best_score.get("rank", rank)),
                 "meter": meter
-                if score >= best_ex_score
+                if perc >= best_perc
                 else best_score.get("meter", meter),
                 "meter_prog": meter_prog
-                if score >= best_ex_score
+                if perc >= best_perc
                 else best_score.get("meter_prog", meter_prog),
             }