[+] Wacca: Unlock all music

src/main/java/icu/samnyan/aqua/sega/wacca/Constants.kt

@@ -52,7 +52,8 @@ enum class WaccaItemType(val type: Int) {
     TOUCH_EFFECT(17);
 
     operator fun invoke() = type
-    operator fun invoke(u: WaccaUser, id: Int) = WcUserItem(type = this(), itemId = id).apply { user = u }
+    operator fun invoke(u: WaccaUser, id: Int, p1: Long = 0, p2: Long = 0, p3: Long = 0) =
+        WcUserItem(type = this(), itemId = id, p1 = p1, p2 = p2, p3 = p3).apply { user = u }
 }
 
 enum class WaccaOptionType(val id: Int, val default: Int) {

src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt

@@ -1,8 +1,11 @@
 package icu.samnyan.aqua.sega.wacca
 
 import ext.*
+import icu.samnyan.aqua.net.db.AquaGameOptions
+import icu.samnyan.aqua.net.games.wacca.Wacca
 import icu.samnyan.aqua.net.utils.ApiException
 import icu.samnyan.aqua.sega.general.dao.CardRepository
+import icu.samnyan.aqua.sega.wacca.WaccaDifficulty.INFERNO
 import icu.samnyan.aqua.sega.wacca.WaccaItemType.*
 import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_COLOR
 import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_SOUND
@@ -12,7 +15,6 @@ import icu.samnyan.aqua.sega.wacca.model.BaseRequest
 import icu.samnyan.aqua.sega.wacca.model.db.*
 import io.ktor.client.utils.*
 import jakarta.servlet.http.HttpServletRequest
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController
 import java.util.*
@@ -23,11 +25,11 @@ val empty = emptyList<Any>()
 
 @RestController
 @API("/g/wacca/")
-class WaccaServer {
+class WaccaServer(
-    @Autowired
+    val cardRepo: CardRepository,
-    lateinit var cardRepo: CardRepository
+    val rp: WaccaRepos,
-    @Autowired
+    val wacca: Wacca
-    lateinit var rp: WaccaRepos
+) {
     val handlerMap = mutableMapOf<String, (BaseRequest, List<Any>) -> Any>()
     val cacheMap = mutableMapOf<String, String>()
 
@@ -172,16 +174,21 @@ fun WaccaServer.init() {
     "user/status/GetDetail" api@ { _, (uid) ->
         val u = user(uid) ?: return@api "[]"
         val o = options(u)
-        val items = rp.item.findByUser(u).groupBy { it.type }
+        val items = rp.item.findByUser(u).groupBy { it.type }.toMutableMap()
         val scores = rp.bestScore.findByUser(u)
         val scoreMap = scores.associateBy { it.musicId to it.level }
         val gates = rp.gate.findByUser(u)
         val bingo = rp.bingo.findByUser(u).firstOrNull()
-        val go = u.card?.aquaUser?.gameOptions
+        val go = u.card?.aquaUser?.gameOptions ?: AquaGameOptions()
 
         // TODO: make this and vip configurable
         // u.wp = 999999
 
+        // All unlock
+        if (go.unlockMusic) {
+            items[MUSIC_UNLOCK()] = wacca.musicMapping.keys.map { MUSIC_UNLOCK(u, it, p1 = INFERNO.value.long()) }
+        }
+
         u.run { ls(
             "0 status" - lStatus(),
             "1 options" - o.map { (k, v) -> ls(k, v) },
@@ -234,8 +241,8 @@ fun WaccaServer.init() {
                 WP() -> { u.wp += param; u.wpTotal += param }
                 XP() -> u.xp += param
                 MUSIC_DIFFICULTY_UNLOCK(),
-                MUSIC_UNLOCK() -> newItems += (ex ?: WcUserItem(MUSIC_UNLOCK(), id))
+                MUSIC_UNLOCK() -> newItems += (ex ?: MUSIC_UNLOCK(u, id))
-                    .apply { user = u; p1 = max(param.long(), p1).coerceAtLeast(WaccaDifficulty.HARD.value.long()) }
+                    .apply { p1 = max(param.long(), p1).coerceAtLeast(WaccaDifficulty.HARD.value.long()) }
                 TROPHY() -> newItems += (ex ?: TROPHY(u, id)).apply { p1 = season.long(); p2 = param.long() }
                 else -> newItems += (ex ?: WcUserItem(type, id)).apply { user = u }
             }