From c26ad10d90a98d0f69c78b3eff40a41233539d37 Mon Sep 17 00:00:00 2001
From: drmext <71258889+drmext@users.noreply.github.com>
Date: Sat, 20 May 2023 19:53:39 +0000
Subject: [PATCH] GITADORA Rivals

---
 modules/gitadora/cardutil.py |  1 +
 modules/gitadora/gametop.py  | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/gitadora/cardutil.py b/modules/gitadora/cardutil.py
index 22aca80..c18277a 100644
--- a/modules/gitadora/cardutil.py
+++ b/modules/gitadora/cardutil.py
@@ -91,6 +91,7 @@ async def gitadora_cardutil_regist(ver: str, request: Request):
         "title": "MONKEY BUSINESS",
         "charaid": 0,
         "stickers": {},
+        "rival_card_ids": [],
     }
 
     for game_type in ("drummania", "guitarfreaks"):
diff --git a/modules/gitadora/gametop.py b/modules/gitadora/gametop.py
index 201748a..f893f99 100644
--- a/modules/gitadora/gametop.py
+++ b/modules/gitadora/gametop.py
@@ -139,15 +139,31 @@ async def gitadora_gametop_get(ver: str, request: Request):
                         E.kind(1, __type="s32"),
                     )
                 ),
-                E.chara_list(),
-                E.title_parts(),
+                E.chara_list(
+                    E.chara(
+                        E.charaid(1, __type="s32"),
+                    )
+                ),
+                E.title_parts(
+                    E.parts("", __type="str"),
+                ),
                 E.information(
                     E.info(profile[g]["information"], __type="u32"),
                 ),
                 E.reward(
                     E.status(profile[g]["reward"], __type="u32"),
                 ),
-                E.rivaldata(),
+                E.rivaldata(
+                    *[
+                        E.rival(
+                            E.did(1, __type="s32"),
+                            E.name("", __type="str"),
+                            E.active_index(r_idx, __type="s32"),
+                            E.refid(r, __type="str"),
+                        )
+                        for r_idx, r in enumerate(profile.get("rival_card_ids", []), 1)
+                    ]
+                ),
                 E.frienddata(E.friend()),
                 E.thanks_medal(
                     E.medal(profile[g]["thanks_medal_medal"], __type="s32"),