Merge branch 'v1-dev' into verse

.github/workflows/docker-image.yml

@@ -6,6 +6,8 @@ on:
     branches:
       - main
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'  # Runs at midnight UTC every Sunday
 
 jobs:
   build-and-push:

AquaNet/src/pages/UserHome.svelte

@@ -318,7 +318,13 @@
     <RatingComposition title="B15" comp={d.user.ratingComposition.best15} {allMusics} game={game != "auto" ? game : "mai2"}/>
     <!-- <RatingComposition title="Hot 10" comp={d.user.ratingComposition.hot10} {allMusics} {game}/> -->
     <!-- <RatingComposition title="N10" comp={d.user.ratingComposition.next10} {allMusics} {game}/> -->
-    <RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} game={game != "auto" ? game : "mai2"} top={10}/>
+     <!-- Chuni -->
+    {#if d.user.ratingComposition.new}
+      <RatingComposition title="New 20" comp={d.user.ratingComposition.new} {allMusics} game="chu3"/>
+    {:else}
+      <RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} game={game != "auto" ? game : "mai2"} top={10}/>
+    {/if}
+
 
     <div class="recent">
       <h2>{t('UserHome.RecentScores')}</h2>

README.md

@@ -33,7 +33,7 @@ Below is a list of games supported by this server.
 
 | Game                   | Ver  | Codename            | Thanks to                                  |
 |------------------------|------|---------------------|--------------------------------------------|
-| SDHD: CHUNITHM         | 2.30 | VERSE¹              | [@rinsama](https://github.com/mxihan)      |
+| SDHD: CHUNITHM         | 2.30 | VERSE               | [@rinsama](https://github.com/mxihan)      |
 | SDEZ: MaiMai DX        | 1.50 | PRiSM               | [@肥宅虾哥](https://github.com/FeiZhaixiage)   |
 | SDGA: MaiMai DX (Intl) | 1.50 | PRiSM               | [@Clansty](https://github.com/clansty)     |
 | SDED: Card Maker       | 1.39 |                     | [@Becods](https://github.com/Becods)       |
@@ -41,8 +41,6 @@ Below is a list of games supported by this server.
 | SBZV: Project DIVA     | 7.10 | Future Tone         |                                            |
 | SDFE: Wacca (*ALPHA)   | 3.07 | Reverse             |                                            |
 
-* ¹: For VERSE, normal gameplay works, but events and new features might be missing. Luminous+ and older are fully supported.
-
 Check out these docs for more information.
 * [Game specific notes](docs/game_specific_notes.md)
 * [Frequently asked questions](docs/frequently_asked_questions.md)

docs/chu3-national-matching.md

@@ -45,6 +45,13 @@ netsh advfirewall firewall add rule name="Chunithm National Matching Outbound" d
 
 ## Troubleshooting
 
+**Q: Me and my friend are queuing but we can't join the same room**
+
+Make sure you both have the same ROM and options (e.g. it would not work if you have luminuous and they have verse, or if you have A121 while they don't).
+
+> [!NOTE]
+> If you just updated your options, your matching will be disabled because of data version mismatch. You need to play for a session, save, and then restart your game for the server-side data version to update.
+
 **Q: Matching server BAD on network check**
 
 Make sure you have selected "Yukiotoko" as your matching server. 

src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt

@@ -29,6 +29,8 @@ class Chusan(
         "nameplateId" to { u, v -> u.nameplateId = v.int },
         "frameId" to { u, v -> u.frameId = v.int },
         "trophyId" to { u, v -> u.trophyId = v.int },
+        "trophyIdSub1" to { u, v -> u.trophyIdSub1 = v.int },
+        "trophyIdSub2" to { u, v -> u.trophyIdSub2 = v.int },
         "mapIconId" to { u, v -> u.mapIconId = v.int },
         "voiceId" to { u, v -> u.voiceId = v.int },
         "avatarWear" to { u, v -> u.avatarWear = v.int },
@@ -52,6 +54,7 @@ class Chusan(
             "best30" to (extra["rating_base_list"] ?: ""),
             "hot10" to (extra["rating_hot_list"] ?: ""),
             "next10" to (extra["rating_next_list"] ?: ""),
+            "new" to (extra["rating_new_list"] ?: ""),
         )
 
         genericUserSummary(card, ratingComposition)