From 4cdf324f85c80ad2fae1607e22db52b2c5507150 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:47:23 +0800 Subject: [PATCH] [O] Request > kt --- .../samnyan/aqua/sega/diva/DivaController.kt | 29 +- .../samnyan/aqua/sega/diva/DivaServices.kt | 2 +- .../aqua/sega/diva/handler/InitHandlers.kt | 2 +- .../diva/handler/card/CardProcedureHandler.kt | 2 +- .../diva/handler/card/ChangeNameHandler.kt | 2 +- .../diva/handler/card/ChangePasswdHandler.kt | 2 +- .../diva/handler/card/RegistrationHandler.kt | 2 +- .../diva/handler/databank/PsRankingHandler.kt | 2 +- .../diva/handler/ingame/BuyCstmzItmHandler.kt | 2 +- .../diva/handler/ingame/BuyModuleHandler.kt | 2 +- .../diva/handler/ingame/GetPvPdHandler.kt | 2 +- .../diva/handler/ingame/ShopExitHandler.kt | 2 +- .../diva/handler/ingame/StageResultHandler.kt | 97 +++---- .../diva/handler/ingame/StageStartHandler.kt | 6 +- .../diva/handler/ingame/StoreSsHandler.kt | 2 +- .../aqua/sega/diva/handler/user/EndHandler.kt | 38 +-- .../sega/diva/handler/user/PdUnlockHandler.kt | 2 +- .../sega/diva/handler/user/PreStartHandler.kt | 2 +- .../diva/handler/user/SpendCreditHandler.kt | 2 +- .../sega/diva/handler/user/StartHandler.kt | 2 +- .../sega/diva/model/request/BaseRequest.java | 34 --- .../sega/diva/model/request/FormRequest.java | 17 -- .../diva/model/request/StageResultRequest.kt | 268 ++++++++++++++++++ .../model/request/boot/AttendRequest.java | 23 -- .../model/request/boot/GameInitRequest.java | 14 - .../request/card/CardProcedureRequest.java | 21 -- .../model/request/card/ChangeNameRequest.java | 24 -- .../request/card/ChangePasswdRequest.java | 23 -- .../request/card/RegistrationRequest.java | 27 -- .../request/databank/PsRankingRequest.java | 19 -- .../request/ingame/BuyCstmzItmRequest.java | 22 -- .../request/ingame/BuyModuleRequest.java | 22 -- .../model/request/ingame/GetPvPdRequest.java | 20 -- .../model/request/ingame/ShopExitRequest.java | 28 -- .../request/ingame/StageResultRequest.java | 111 -------- .../request/ingame/StageStartRequest.java | 45 --- .../model/request/ingame/StoreSsRequest.java | 25 -- .../model/request/user/PdUnlockRequest.java | 19 -- .../model/request/user/PreStartRequest.java | 26 -- .../request/user/SpendCreditRequest.java | 23 -- .../diva/model/request/user/StartRequest.java | 19 -- 41 files changed, 369 insertions(+), 663 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/BaseRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/FormRequest.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/AttendRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/GameInitRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/CardProcedureRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangeNameRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangePasswdRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/RegistrationRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/PsRankingRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyCstmzItmRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyModuleRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/GetPvPdRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/ShopExitRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageResultRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageStartRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StoreSsRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PdUnlockRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PreStartRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/SpendCreditRequest.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/StartRequest.java diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt index b075211d..91ed5342 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt @@ -14,17 +14,22 @@ import icu.samnyan.aqua.sega.diva.handler.databank.* import icu.samnyan.aqua.sega.diva.handler.ingame.* import icu.samnyan.aqua.sega.diva.handler.user.* import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.request.boot.GameInitRequest -import icu.samnyan.aqua.sega.diva.model.request.card.CardProcedureRequest -import icu.samnyan.aqua.sega.diva.model.request.card.ChangeNameRequest -import icu.samnyan.aqua.sega.diva.model.request.card.ChangePasswdRequest -import icu.samnyan.aqua.sega.diva.model.request.card.RegistrationRequest -import icu.samnyan.aqua.sega.diva.model.request.databank.PsRankingRequest -import icu.samnyan.aqua.sega.diva.model.request.ingame.* -import icu.samnyan.aqua.sega.diva.model.request.user.PdUnlockRequest -import icu.samnyan.aqua.sega.diva.model.request.user.PreStartRequest -import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest -import icu.samnyan.aqua.sega.diva.model.request.user.StartRequest +import icu.samnyan.aqua.sega.diva.model.request.BuyCstmzItmRequest +import icu.samnyan.aqua.sega.diva.model.request.BuyModuleRequest +import icu.samnyan.aqua.sega.diva.model.request.CardProcedureRequest +import icu.samnyan.aqua.sega.diva.model.request.ChangeNameRequest +import icu.samnyan.aqua.sega.diva.model.request.ChangePasswdRequest +import icu.samnyan.aqua.sega.diva.model.request.GetPvPdRequest +import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.request.ShopExitRequest +import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.request.StageStartRequest +import icu.samnyan.aqua.sega.diva.model.request.StoreSsRequest +import icu.samnyan.aqua.sega.diva.model.request.PsRankingRequest +import icu.samnyan.aqua.sega.diva.model.request.PdUnlockRequest +import icu.samnyan.aqua.sega.diva.model.request.PreStartRequest +import icu.samnyan.aqua.sega.diva.model.request.SpendCreditRequest +import icu.samnyan.aqua.sega.diva.model.request.StartRequest import icu.samnyan.aqua.sega.diva.util.DivaMapper import icu.samnyan.aqua.sega.diva.util.DivaTime import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode @@ -93,7 +98,7 @@ class DivaController( logger.info("{}: {}", command, body) val respObj = when (command) { "game_init" -> DIVA_INIT - "attend" -> attendHandler.handle(mapper.convert(body, GameInitRequest::class.java)) + "attend" -> attendHandler.handle() "test" -> DIVA_INIT "nv_ranking" -> nvRankingHandler.handle(mapper.convert(body, BaseRequest::class.java)) "ps_ranking" -> psRankingHandler.handle(mapper.convert(body, PsRankingRequest::class.java)) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt index 05a690d0..521dd5a8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaServices.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.diva -import icu.samnyan.aqua.sega.diva.model.request.card.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerCustomize import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerModule import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt index 908a4fb7..ee7a6fd5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt @@ -52,7 +52,7 @@ fun EtcParameter(): String { @Component class AttendHandler { - fun handle(request: BaseRequest) = mapOf( + fun handle() = mapOf( "atnd_prm1" to EtcParameter(), "atnd_prm2" to mapOf( "max_pd_items" to 30, "" to 1, "max_ps_rankings" to 100, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt index 92a045bd..8cce143c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.common.StartMode -import icu.samnyan.aqua.sega.diva.model.request.card.CardProcedureRequest +import icu.samnyan.aqua.sega.diva.model.request.CardProcedureRequest import icu.samnyan.aqua.sega.diva.model.response.card.CardProcedureResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt index 361994e7..3eab7fec 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.card.ChangeNameRequest +import icu.samnyan.aqua.sega.diva.model.request.ChangeNameRequest import icu.samnyan.aqua.sega.diva.model.response.card.ChangeNameResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt index 17112200..2c5d533c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.PassStat import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.card.ChangePasswdRequest +import icu.samnyan.aqua.sega.diva.model.request.ChangePasswdRequest import icu.samnyan.aqua.sega.diva.model.response.card.ChangePasswdResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt index 02df9814..fcc9939e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.PlayerProfileService import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.card.RegistrationRequest +import icu.samnyan.aqua.sega.diva.model.request.RegistrationRequest import icu.samnyan.aqua.sega.diva.model.response.card.RegistrationResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt index 253200a4..ec59b8e3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt @@ -5,7 +5,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Difficulty import icu.samnyan.aqua.sega.diva.model.common.Edition import icu.samnyan.aqua.sega.diva.model.common.collection.PsRankingCollection -import icu.samnyan.aqua.sega.diva.model.request.databank.PsRankingRequest +import icu.samnyan.aqua.sega.diva.model.request.PsRankingRequest import icu.samnyan.aqua.sega.diva.model.response.databank.PsRankingResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt index ed93f110..b3f0e8c9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.invoke import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ingame.BuyCstmzItmRequest +import icu.samnyan.aqua.sega.diva.model.request.BuyCstmzItmRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyCstmzItmResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt index 5c9314ab..52fd5629 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ingame.BuyModuleRequest +import icu.samnyan.aqua.sega.diva.model.request.BuyModuleRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyModuleResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt index baf29a07..e2097784 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Difficulty import icu.samnyan.aqua.sega.diva.model.common.Edition -import icu.samnyan.aqua.sega.diva.model.request.ingame.GetPvPdRequest +import icu.samnyan.aqua.sega.diva.model.request.GetPvPdRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.GetPvPdResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt index c700d6c3..4c966ac3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.csv import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result -import icu.samnyan.aqua.sega.diva.model.request.ingame.ShopExitRequest +import icu.samnyan.aqua.sega.diva.model.request.ShopExitRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.ShopExitResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt index 017b0dd0..5bd8ae8d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt @@ -3,12 +3,8 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.logger import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.* -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayLog -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerCustomize -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerInventory -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord -import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.db.userdata.* +import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse import icu.samnyan.aqua.sega.diva.util.DivaCalculator import org.apache.commons.lang3.StringUtils @@ -33,13 +29,12 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { val logger = logger() fun handle(request: StageResultRequest): Any { - if (request.getPd_id() != -1L) { + if (request.pd_id != -1L) { val (profile, session) = db.session(request.pd_id) currentProfile = profile // Get the last played index - request.getStg_ply_pv_id() - val stageArr = request.getStg_ply_pv_id() + val stageArr = request.stg_ply_pv_id var stageIndex = 0 if (stageArr[0] != -1) { stageIndex = 0 @@ -67,7 +62,7 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { .orElseGet(Supplier { PlayerPvRecord(profile, log.pvId, log.edition, log.difficulty) }) // Not save personal record in no fail mode - if (request.getGame_type() != 1) { + if (request.game_type != 1) { // Only update personal record when using rhythm game option if (log.rhythmGameOptions == "0,0,0") { // Update pvRecord field @@ -105,7 +100,7 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { // Calculate reward // Contest reward - var contestSpecifier = String.join(",", *request.getCr_sp()) + var contestSpecifier = String.join(",", *request.cr_sp) val contestRewardType = arrayOf("-1", "-1", "-1") val contestRewardValue = arrayOf("-1", "-1", "-1") val contestRewardString1 = arrayOf("***", "***", "***") @@ -114,9 +109,9 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { var contestEntryRewardValue = -1 var contestEntryRewardString1: kotlin.String? = "***" var contestEntryRewardString2: kotlin.String? = "***" - val contestId = request.getCr_cid() + val contestId = request.cr_cid if (contestId != -1) { - val progress = getContestProgress(request.getCr_sp()) + val progress = getContestProgress(request.cr_sp) contestSpecifier = getContestSpecifier(progress) // Check if the contest info exist @@ -206,8 +201,8 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { profile.plateId, session.vp, 0, - request.getCr_cid(), - request.getCr_tv(), + request.cr_cid, + request.cr_tv, contestSpecifier, String.join(",", *contestRewardType), String.join(",", *contestRewardValue), @@ -249,42 +244,42 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { private fun getLog(request: StageResultRequest, profile: PlayerProfile, i: Int): PlayLog { return PlayLog( profile, - request.getStg_ply_pv_id()[i], - Difficulty.fromValue(request.getStg_difficulty()[i]), - Edition.fromValue(request.getStg_edtn()[i]), - request.getStg_scrpt_ver()[i], - request.getStg_score()[i], - ChallengeKind.fromValue(request.getStg_chllng_kind()[i]), - request.getStg_chllng_result()[i], - ClearResult.fromValue(request.getStg_clr_kind()[i]), - request.getStg_vcld_pts()[i], - request.getStg_cool_cnt()[i], - request.getStg_cool_pct()[i], - request.getStg_fine_cnt()[i], - request.getStg_fine_pct()[i], - request.getStg_safe_cnt()[i], - request.getStg_safe_pct()[i], - request.getStg_sad_cnt()[i], - request.getStg_sad_pct()[i], - request.getStg_wt_wg_cnt()[i], - request.getStg_wt_wg_pct()[i], - request.getStg_max_cmb()[i], - request.getStg_chance_tm()[i], - request.getStg_sm_hl()[i], - request.getStg_atn_pnt()[i], - request.getStg_skin_id()[i], - request.getStg_btn_se()[i], - request.getStg_btn_se_vol()[i], - request.getStg_sld_se()[i], - request.getStg_chn_sld_se()[i], - request.getStg_sldr_tch_se()[i], - slice(request.getStg_mdl_id(), 3, i), - request.getStg_cpt_rslt()[i], - request.getStg_sld_scr()[i], - request.getStg_vcl_chg()[i], - slice(request.getStg_c_itm_id(), 12, i), - slice(request.getStg_rgo(), 3, i), - request.getStg_ss_num()[i], + request.stg_ply_pv_id[i], + Difficulty.fromValue(request.stg_difficulty[i]), + Edition.fromValue(request.stg_edtn[i]), + request.stg_scrpt_ver[i], + request.stg_score[i], + ChallengeKind.fromValue(request.stg_chllng_kind[i]), + request.stg_chllng_result[i], + ClearResult.fromValue(request.stg_clr_kind[i]), + request.stg_vcld_pts[i], + request.stg_cool_cnt[i], + request.stg_cool_pct[i], + request.stg_fine_cnt[i], + request.stg_fine_pct[i], + request.stg_safe_cnt[i], + request.stg_safe_pct[i], + request.stg_sad_cnt[i], + request.stg_sad_pct[i], + request.stg_wt_wg_cnt[i], + request.stg_wt_wg_pct[i], + request.stg_max_cmb[i], + request.stg_chance_tm[i], + request.stg_sm_hl[i], + request.stg_atn_pnt[i], + request.stg_skin_id[i], + request.stg_btn_se[i], + request.stg_btn_se_vol[i], + request.stg_sld_se[i], + request.stg_chn_sld_se[i], + request.stg_sldr_tch_se[i], + slice(request.stg_mdl_id, 3, i), + request.stg_cpt_rslt[i], + request.stg_sld_scr[i], + request.stg_vcl_chg[i], + slice(request.stg_c_itm_id, 12, i), + slice(request.stg_rgo, 3, i), + request.stg_ss_num[i], request.time_stamp.toLocalDateTime() ) } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt index 5521a99b..b1de2585 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.emptyMap import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.ingame.StageStartRequest +import icu.samnyan.aqua.sega.diva.model.request.StageStartRequest import org.springframework.stereotype.Component /** @@ -11,10 +11,10 @@ import org.springframework.stereotype.Component @Component class StageStartHandler(val db: DivaRepos) { fun handle(request: StageStartRequest): Any { - if (request.getPd_id() != -1L) { + if (request.pd_id != -1L) { val (_, session) = db.session(request.pd_id) - val stageArr = request.getStg_ply_pv_id() + val stageArr = request.stg_ply_pv_id var stageIndex = 0 if (stageArr[0] != -1) { stageIndex = 0 diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt index e9495d01..83f7f679 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt @@ -5,7 +5,7 @@ import ext.logger import icu.samnyan.aqua.sega.diva.DIVA_BAD import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.ingame.StoreSsRequest +import icu.samnyan.aqua.sega.diva.model.request.StoreSsRequest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerScreenShot import org.springframework.stereotype.Component import org.springframework.web.multipart.MultipartFile diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt index 5277878e..af49650d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt @@ -8,7 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.common.Edition import icu.samnyan.aqua.sega.diva.model.common.SortMode import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest -import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest +import icu.samnyan.aqua.sega.diva.model.request.StageResultRequest import icu.samnyan.aqua.sega.diva.util.DivaStringUtils import org.springframework.stereotype.Component import java.lang.String @@ -26,34 +26,34 @@ class EndHandler(val db: DivaRepos) { fun handle(request: StageResultRequest): Any { val (profile, session) = db.session(request.pd_id) - profile.headphoneVolume = request.getHp_vol() - profile.buttonSeOn = request.isBtn_se_vol - profile.buttonSeVolume = request.getBtn_se_vol2() - profile.sliderSeVolume = request.getSldr_se_vol2() + profile.headphoneVolume = request.hp_vol + profile.buttonSeOn = request.btn_se_vol + profile.buttonSeVolume = request.btn_se_vol2 + profile.sliderSeVolume = request.sldr_se_vol2 profile.vocaloidPoints = session.vp profile.level = session.levelNumber profile.levelExp = session.levelExp - profile.nextPvId = request.getNxt_pv_id() - profile.nextDifficulty = Difficulty.fromValue(request.getNxt_dffclty()) - profile.nextEdition = Edition.fromValue(request.getNxt_edtn()) - profile.sortMode = SortMode.fromValue(request.getSort_kind()) + profile.nextPvId = request.nxt_pv_id + profile.nextDifficulty = Difficulty.fromValue(request.nxt_dffclty) + profile.nextEdition = Edition.fromValue(request.nxt_edtn) + profile.sortMode = SortMode.fromValue(request.sort_kind) - if (request.getCr_cid() != -1) { - val contest = db.g.contest.findById(request.getCr_cid()).orElseGet(Supplier { Contest() }) - val currentResultRank = getContestRank(contest, request.getCr_tv()) - if (request.getCr_if() == 0) { + if (request.cr_cid != -1) { + val contest = db.g.contest.findById(request.cr_cid).orElseGet(Supplier { Contest() }) + val currentResultRank = getContestRank(contest, request.cr_tv) + if (request.cr_if == 0) { // Do contest is playing profile.contestNowPlayingEnable = true - profile.contestNowPlayingId = request.getCr_cid() + profile.contestNowPlayingId = request.cr_cid profile.contestNowPlayingResultRank = currentResultRank - profile.contestNowPlayingValue = request.getCr_tv() - profile.contestNowPlayingSpecifier = String.join(",", *request.getCr_sp()) + profile.contestNowPlayingValue = request.cr_tv + profile.contestNowPlayingSpecifier = String.join(",", *request.cr_sp) } else { val contestRecord = - db.contest.findByPdIdAndContestId(profile, request.getCr_cid()).orElseGet( - Supplier { PlayerContest(profile, request.getCr_cid()) }) + db.contest.findByPdIdAndContestId(profile, request.cr_cid).orElseGet( + Supplier { PlayerContest(profile, request.cr_cid) }) contestRecord.startCount += 1 - contestRecord.bestValue = max(contestRecord.bestValue, request.getCr_tv()) + contestRecord.bestValue = max(contestRecord.bestValue, request.cr_tv) contestRecord.resultRank = if (currentResultRank.value > contestRecord.resultRank .value ) currentResultRank else contestRecord.resultRank diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt index bfa72390..69020560 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.user.PdUnlockRequest +import icu.samnyan.aqua.sega.diva.model.request.PdUnlockRequest import org.springframework.stereotype.Component @Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt index 37a5d3aa..39e92a25 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt @@ -5,7 +5,7 @@ import ext.logger import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.PreStartResult import icu.samnyan.aqua.sega.diva.model.common.StartMode -import icu.samnyan.aqua.sega.diva.model.request.user.PreStartRequest +import icu.samnyan.aqua.sega.diva.model.request.PreStartRequest import icu.samnyan.aqua.sega.diva.model.response.user.PreStartResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt index 6f31ba7e..b2c051a8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest +import icu.samnyan.aqua.sega.diva.model.request.SpendCreditRequest import icu.samnyan.aqua.sega.diva.model.response.user.SpendCreditResponse import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt index 848d51be..a4679c8b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt @@ -7,7 +7,7 @@ import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord -import icu.samnyan.aqua.sega.diva.model.request.user.StartRequest +import icu.samnyan.aqua.sega.diva.model.request.StartRequest import icu.samnyan.aqua.sega.diva.model.response.user.StartResponse import icu.samnyan.aqua.sega.diva.util.PvRecordDataException import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/BaseRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/BaseRequest.java deleted file mode 100644 index 93d19c28..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/BaseRequest.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.ZonedDateTime; - -/** - * Data format from https://dev.s-ul.eu/mikumiku/minime/wikis/home - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class BaseRequest { - private String cmd; // Command - private String req_id; // Request Id - private String game_id; // Game Id - private String r_ver; // Game Version - private String kc_serial; // KeyChip Serial - private String b_serial; // Board Serial - private String place_id; // Place Id - private ZonedDateTime time_stamp; - private String start_up_mode; // Satellite mode, as on dipsw#1, 0 is SUB and 1 is MAIN - private String cmm_dly_mod; - private String cmm_dly_sec; - private String cmm_err_mod; - private String country_code; - private String region_code; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/FormRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/FormRequest.java deleted file mode 100644 index 4aca88d0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/FormRequest.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.web.multipart.MultipartFile; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class FormRequest { - private String query; - private MultipartFile bin; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt new file mode 100644 index 00000000..57fe0b4d --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/StageResultRequest.kt @@ -0,0 +1,268 @@ +package icu.samnyan.aqua.sega.diva.model.request + +import java.time.ZonedDateTime + +/** + * Data format from https://dev.s-ul.eu/mikumiku/minime/wikis/home + * + * @author samnyan (privateamusement@protonmail.com) + */ +open class BaseRequest { + // var cmd: String = "" // Command + // var req_id: String = "" // Request Id + var game_id: String = "" // Game Id + // var r_ver: String = "" // Game Version + // var kc_serial: String = "" // KeyChip Serial + // var b_serial: String = "" // Board Serial + var place_id: String = "" // Place Id + var time_stamp: ZonedDateTime = ZonedDateTime.now() // Timestamp + // var start_up_mode: String = "" // Satellite mode, as on dipsw#1, 0 is SUB and 1 is MAIN + // var cmm_dly_mod: String = "" + // var cmm_dly_sec: String = "" + // var cmm_err_mod: String = "" + // var country_code: String = "" + // var region_code: String = "" +} + +class StageResultRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx: Int = 0 + // var start_idx: Int = 0 + var hp_vol: Int = 0 + var btn_se_vol: Boolean = false + var btn_se_vol2: Int = 0 + var sldr_se_vol2: Int = 0 + // var use_pv_mdl_eqp: Boolean = false + // var vcld_pts: Int = 0 + var nxt_pv_id: Int = 0 + var nxt_dffclty: Int = 0 + var nxt_edtn: Int = 0 + var sort_kind: Int = 0 + // var nblss_ltt_stts: Int = 0 + // var nblss_ltt_tckt: Int = 0 + // var my_qst_id: IntArray = intArrayOf() + // var my_qst_sts: IntArray = intArrayOf() + // var free_play: Boolean = false + var game_type: Int = 0 + var stg_difficulty: IntArray = intArrayOf() + var stg_edtn: IntArray = intArrayOf() + var stg_ply_pv_id: IntArray = intArrayOf() + // var stg_sel_pv_id: IntArray = intArrayOf() + var stg_scrpt_ver: IntArray = intArrayOf() + var stg_score: IntArray = intArrayOf() + var stg_chllng_kind: IntArray = intArrayOf() + var stg_chllng_result: IntArray = intArrayOf() + var stg_clr_kind: IntArray = intArrayOf() + var stg_vcld_pts: IntArray = intArrayOf() + var stg_cool_cnt: IntArray = intArrayOf() + var stg_cool_pct: IntArray = intArrayOf() + var stg_fine_cnt: IntArray = intArrayOf() + var stg_fine_pct: IntArray = intArrayOf() + var stg_safe_cnt: IntArray = intArrayOf() + var stg_safe_pct: IntArray = intArrayOf() + var stg_sad_cnt: IntArray = intArrayOf() + var stg_sad_pct: IntArray = intArrayOf() + var stg_wt_wg_cnt: IntArray = intArrayOf() + var stg_wt_wg_pct: IntArray = intArrayOf() + + var stg_max_cmb: IntArray = intArrayOf() + var stg_chance_tm: IntArray = intArrayOf() + var stg_sm_hl: IntArray = intArrayOf() + var stg_atn_pnt: IntArray = intArrayOf() + var stg_skin_id: IntArray = intArrayOf() + var stg_btn_se: IntArray = intArrayOf() + var stg_btn_se_vol: IntArray = intArrayOf() + var stg_sld_se: IntArray = intArrayOf() + var stg_chn_sld_se: IntArray = intArrayOf() + var stg_sldr_tch_se: IntArray = intArrayOf() + var stg_mdl_id: IntArray = intArrayOf() + // var stg_sel_mdl_id: IntArray = intArrayOf() + // var stg_rvl_pd_id: IntArray = intArrayOf() + // var stg_rvl_wl: IntArray = intArrayOf() + var stg_cpt_rslt: IntArray = intArrayOf() + var stg_sld_scr: IntArray = intArrayOf() + // var stg_is_sr_gm: IntArray = intArrayOf() + // var stg_pv_brnch_rslt: IntArray = intArrayOf() + var stg_vcl_chg: IntArray = intArrayOf() + var stg_c_itm_id: IntArray = intArrayOf() + // var stg_ms_itm_flg: IntArray = intArrayOf() + var stg_rgo: IntArray = intArrayOf() + var stg_ss_num: IntArray = intArrayOf() + // var stg_is_cs_scs: IntArray = intArrayOf() + // var stg_is_nppg_use: IntArray = intArrayOf() + // var stg_p_std_lo_id: IntArray = intArrayOf() + // var stg_p_std_is_to: IntArray = intArrayOf() + // var stg_p_std_is_ccu: IntArray = intArrayOf() + // var stg_p_std_is_tiu: IntArray = intArrayOf() + // var stg_p_std_is_iu: IntArray = intArrayOf() + // var stg_p_std_is_npu: IntArray = intArrayOf() + // var stg_p_std_is_du: IntArray = intArrayOf() + // var ply_pv_id: Int = 0 + // var ttl_vp_add: Int = 0 + // var ttl_vp_sub: Int = 0 + // var continue_cnt: Int = 0 + // var gu_cmd: IntArray = intArrayOf() + // var mdl_eqp_cmn_ary: IntArray = intArrayOf() + // var c_itm_eqp_cmn_ary: IntArray = intArrayOf() + // var ms_itm_flg_cmn_ary: IntArray = intArrayOf() + // var mdl_eqp_pv_ary: IntArray = intArrayOf() + // var c_itm_eqp_pv_ary: IntArray = intArrayOf() + // var ms_itm_flg_pv_ary: IntArray = intArrayOf() + // var stg_mdl_s_sts: IntArray = intArrayOf() + + var cr_cid: Int = 0 + // var cr_sc: Int = 0 + var cr_tv: Int = 0 + var cr_if: Int = 0 + var cr_sp: Array = arrayOf() +} + +class StageStartRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx: Int = 0 + // var start_idx: Int = 0 + // var free_play: Boolean = false + // var game_type: Int = 0 + // var stg_difficulty: IntArray = intArrayOf() + // var stg_edtn: IntArray = intArrayOf() + var stg_ply_pv_id: IntArray = intArrayOf() + // var stg_sel_pv_id: IntArray = intArrayOf() + // var stg_scrpt_ver: IntArray = intArrayOf() + // var stg_skin_id: IntArray = intArrayOf() + // var stg_btn_se: IntArray = intArrayOf() + // var stg_btn_se_vol: IntArray = intArrayOf() + // var stg_sld_se: IntArray = intArrayOf() + // var stg_chn_sld_se: IntArray = intArrayOf() + // var stg_sldr_tch_se: IntArray = intArrayOf() + // var stg_mdl_id: IntArray = intArrayOf() + // var stg_sel_mdl_id: IntArray = intArrayOf() + // var stg_rvl_pd_id: IntArray = intArrayOf() + // var stg_c_itm_id: IntArray = intArrayOf() + // var stg_ms_itm_flg: IntArray = intArrayOf() + // var stg_rgo: IntArray = intArrayOf() + // var stg_ss_num: IntArray = intArrayOf() + // var stg_is_cs_scs: IntArray = intArrayOf() + // var continue_cnt: Int = 0 +} + +class StartRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx: Int = 0 +} + +class StoreSsRequest : BaseRequest() { + var pd_id: Long = 0 + // var ss_dat_id: String = "" + // var ss_pv_id = 0 + // var ss_sel_pv_id = 0 + var ss_mdl_id: IntArray = intArrayOf() + // var ss_sel_mdl_id: IntArray = intArrayOf() + var ss_c_itm_id: IntArray = intArrayOf() + // var ss_pxl_sz: IntArray = intArrayOf() +} + +class SpendCreditRequest : BaseRequest() { + var pd_id: Long = 0 + // var my_qst_id: IntArray = intArrayOf() + // var my_qst_sts: IntArray = intArrayOf() + // var crdt_typ = 0 + // var cmpgn_id: IntArray = intArrayOf() + // var cmpgn_pb: IntArray = intArrayOf() +} + +class ShopExitRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx = 0 + // var start_idx = 0 + var use_pv_mdl_eqp = 0 + var ply_pv_id = 0 + var mdl_eqp_cmn_ary: IntArray = intArrayOf() + var c_itm_eqp_cmn_ary: IntArray = intArrayOf() + var ms_itm_flg_cmn_ary: IntArray = intArrayOf() + var mdl_eqp_pv_ary: IntArray = intArrayOf() + var c_itm_eqp_pv_ary: IntArray = intArrayOf() + var ms_itm_flg_pv_ary: IntArray = intArrayOf() +} + +class RegistrationRequest : BaseRequest() { + // var pmm: String = "" + var idm: String = "" + // var mmgameid: String = "" + // var mmuid: String = "" + // var a_code: String = "" + var aime_id: Long = 0 + // var aime_a_code: String = "" + // var key_obj_type: String = "" + var player_name: String = "" + // var passwd: String = "" +} + +class PsRankingRequest : BaseRequest() { + var rnk_ps_pv_id_lst: IntArray = intArrayOf() + var rnk_ps_idx = 0 +} + +class PreStartRequest : BaseRequest() { + // var pmm: String = "" + var idm: String = "" + // var mmgameid: String = "" + // var mmuid: String = "" + // var a_code: String = "" + var aime_id: Long = 0 + // var aime_a_code: String = "" + // var key_obj_type: String = "" + // var exec_vu = false +} + +class PdUnlockRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx = 0 +} + +class GetPvPdRequest : BaseRequest() { + var pd_id: Long = 0 + var difficulty = 0 + var pd_pv_id_lst: IntArray = intArrayOf() +} + +class ChangePasswdRequest : BaseRequest() { + // var a_code: String = "" + // var aime_id: Long = 0 + // var aime_a_code: String = "" + var pd_id: Long = 0 + // var accept_idx = 0 + var new_passwd: String = "" +} + +class ChangeNameRequest : BaseRequest() { + // var a_code: String = "" + // var aime_id: Long = 0 + // var aime_a_code: String = "" + var pd_id: Long = 0 + // var accept_idx = 0 + var player_name: String = "" + // var chg_name_price = 0 +} + +class CardProcedureRequest : BaseRequest() { + // var cd_adm_cmd = 0 + // var a_code: String = "" + var aime_id: Long = 0 + // var aime_a_code: String = "" +} + +class BuyModuleRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx = 0 + // var start_idx = 0 + var mdl_id = 0 + // var mdl_price = 0 +} + +class BuyCstmzItmRequest : BaseRequest() { + var pd_id: Long = 0 + // var accept_idx = 0 + // var start_idx = 0 + var cstmz_itm_id = 0 + // var cstmz_itm_price = 0 +} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/AttendRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/AttendRequest.java deleted file mode 100644 index 5356cb7a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/AttendRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.boot; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * https://dev.s-ul.eu/mikumiku/minime/wikis/Command/attend - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class AttendRequest extends BaseRequest { - public String atnd_lut; // Date-Time of last attend state update - public String atnd_prm1; // Etc. Parameter, only 14 are used, but array of 100 int - public String atnd_prm2; // Game balance parameter, only 89 are used of 100 - public String atnd_prm3; // Dispersal parameter, only 6 used of 100 -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/GameInitRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/GameInitRequest.java deleted file mode 100644 index 22b70a11..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/boot/GameInitRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.boot; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class GameInitRequest extends BaseRequest { - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/CardProcedureRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/CardProcedureRequest.java deleted file mode 100644 index 59c76fd1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/CardProcedureRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.card; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class CardProcedureRequest extends BaseRequest { - private int cd_adm_cmd; - private String a_code; - private long aime_id; - private String aime_a_code; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangeNameRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangeNameRequest.java deleted file mode 100644 index 1c2466db..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangeNameRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.card; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class ChangeNameRequest extends BaseRequest { - private String a_code; - private long aime_id; - private String aime_a_code; - private long pd_id; - private int accept_idx; - private String player_name; - private int chg_name_price; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangePasswdRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangePasswdRequest.java deleted file mode 100644 index 86287a8f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/ChangePasswdRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.card; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class ChangePasswdRequest extends BaseRequest { - private String a_code; - private long aime_id; - private String aime_a_code; - private long pd_id; - private int accept_idx; - private String new_passwd; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/RegistrationRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/RegistrationRequest.java deleted file mode 100644 index d0556c7e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/card/RegistrationRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.card; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class RegistrationRequest extends BaseRequest { - private String pmm; - private String idm; - private String mmgameid; - private String mmuid; - private String a_code; - private long aime_id; - private String aime_a_code; - private String key_obj_type; - private String player_name; - private String passwd; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/PsRankingRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/PsRankingRequest.java deleted file mode 100644 index fbfc61aa..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/databank/PsRankingRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.databank; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class PsRankingRequest extends BaseRequest { - private int[] rnk_ps_pv_id_lst; - private int rnk_ps_idx; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyCstmzItmRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyCstmzItmRequest.java deleted file mode 100644 index e1142eb5..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyCstmzItmRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class BuyCstmzItmRequest extends BaseRequest { - private long pd_id; - private int accept_idx; - private int start_idx; - private int cstmz_itm_id; - private int cstmz_itm_price; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyModuleRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyModuleRequest.java deleted file mode 100644 index 963e337d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/BuyModuleRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class BuyModuleRequest extends BaseRequest { - private long pd_id; - private int accept_idx; - private int start_idx; - private int mdl_id; - private int mdl_price; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/GetPvPdRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/GetPvPdRequest.java deleted file mode 100644 index 1dca7e44..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/GetPvPdRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class GetPvPdRequest extends BaseRequest { - private long pd_id; - private int difficulty; - private int[] pd_pv_id_lst; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/ShopExitRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/ShopExitRequest.java deleted file mode 100644 index aebb3c37..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/ShopExitRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class ShopExitRequest extends BaseRequest { - private long pd_id; - private int accept_idx; - private int start_idx; - private int use_pv_mdl_eqp; - private int ply_pv_id; - private int[] mdl_eqp_cmn_ary; - private int[] c_itm_eqp_cmn_ary; - private int[] ms_itm_flg_cmn_ary; - private int[] mdl_eqp_pv_ary; - private int[] c_itm_eqp_pv_ary; - private int[] ms_itm_flg_pv_ary; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageResultRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageResultRequest.java deleted file mode 100644 index c4a733a7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageResultRequest.java +++ /dev/null @@ -1,111 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class StageResultRequest extends BaseRequest { - public long pd_id; - public int accept_idx; - public int start_idx; - public int hp_vol; - public boolean btn_se_vol; - public int btn_se_vol2; - public int sldr_se_vol2; - public boolean use_pv_mdl_eqp; - public int vcld_pts; - public int nxt_pv_id; - public int nxt_dffclty; - public int nxt_edtn; - public int sort_kind; - public int nblss_ltt_stts; - public int nblss_ltt_tckt; - public int[] my_qst_id; - public int[] my_qst_sts; - public boolean free_play; - public int game_type; - public int[] stg_difficulty; - public int[] stg_edtn; - public int[] stg_ply_pv_id; - public int[] stg_sel_pv_id; - public int[] stg_scrpt_ver; - public int[] stg_score; - public int[] stg_chllng_kind; - public int[] stg_chllng_result; - public int[] stg_clr_kind; - public int[] stg_vcld_pts; - public int[] stg_cool_cnt; - public int[] stg_cool_pct; - public int[] stg_fine_cnt; - public int[] stg_fine_pct; - public int[] stg_safe_cnt; - public int[] stg_safe_pct; - public int[] stg_sad_cnt; - public int[] stg_sad_pct; - public int[] stg_wt_wg_cnt; - public int[] stg_wt_wg_pct; - - public int[] stg_max_cmb; - public int[] stg_chance_tm; - public int[] stg_sm_hl; - public int[] stg_atn_pnt; - public int[] stg_skin_id; - public int[] stg_btn_se; - public int[] stg_btn_se_vol; - public int[] stg_sld_se; - public int[] stg_chn_sld_se; - public int[] stg_sldr_tch_se; - public int[] stg_mdl_id; - public int[] stg_sel_mdl_id; - public int[] stg_rvl_pd_id; - public int[] stg_rvl_wl; - public int[] stg_cpt_rslt; - public int[] stg_sld_scr; - public int[] stg_is_sr_gm; - public int[] stg_pv_brnch_rslt; - public int[] stg_vcl_chg; - public int[] stg_c_itm_id; - public int[] stg_ms_itm_flg; - public int[] stg_rgo; - public int[] stg_ss_num; - public int[] stg_is_cs_scs; - public int[] stg_is_nppg_use; - public int[] stg_p_std_lo_id; - public int[] stg_p_std_is_to; - public int[] stg_p_std_is_ccu; - public int[] stg_p_std_is_tiu; - public int[] stg_p_std_is_iu; - public int[] stg_p_std_is_npu; - public int[] stg_p_std_is_du; - - public int ply_pv_id; - - public int ttl_vp_add; - public int ttl_vp_sub; - - public int continue_cnt; - public int[] gu_cmd; - - public int[] mdl_eqp_cmn_ary; - public int[] c_itm_eqp_cmn_ary; - public int[] ms_itm_flg_cmn_ary; - public int[] mdl_eqp_pv_ary; - public int[] c_itm_eqp_pv_ary; - public int[] ms_itm_flg_pv_ary; - public int[] stg_mdl_s_sts; - - public int cr_cid; - public int cr_sc; - public int cr_tv; - public int cr_if; - public String[] cr_sp; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageStartRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageStartRequest.java deleted file mode 100644 index 9162507a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StageStartRequest.java +++ /dev/null @@ -1,45 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class StageStartRequest extends BaseRequest { - public long pd_id; - public int accept_idx; - public int start_idx; - public boolean free_play; - public int game_type; - public int[] stg_difficulty; - public int[] stg_edtn; - public int[] stg_ply_pv_id; - public int[] stg_sel_pv_id; // - public int[] stg_scrpt_ver; - - public int[] stg_skin_id; - public int[] stg_btn_se; - public int[] stg_btn_se_vol; - public int[] stg_sld_se; - public int[] stg_chn_sld_se; - public int[] stg_sldr_tch_se; - public int[] stg_mdl_id; - public int[] stg_sel_mdl_id; - public int[] stg_rvl_pd_id; - public int[] stg_c_itm_id; - public int[] stg_ms_itm_flg; - public int[] stg_rgo; - public int[] stg_ss_num; - public int[] stg_is_cs_scs; - - public int continue_cnt; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StoreSsRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StoreSsRequest.java deleted file mode 100644 index df2ee3a7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/ingame/StoreSsRequest.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.ingame; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class StoreSsRequest extends BaseRequest { - private long pd_id; - private String ss_dat_id; - private int ss_pv_id; - private int ss_sel_pv_id; - private int[] ss_mdl_id; - private int[] ss_sel_mdl_id; - private int[] ss_c_itm_id; - private int[] ss_pxl_sz; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PdUnlockRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PdUnlockRequest.java deleted file mode 100644 index 6d5317ed..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PdUnlockRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.user; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class PdUnlockRequest extends BaseRequest { - private long pd_id; - private int accept_idx; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PreStartRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PreStartRequest.java deleted file mode 100644 index 3460bacd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/PreStartRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.user; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class PreStartRequest extends BaseRequest { - private String pmm; - private String idm; - private String mmgameid; - private String mmuid; - private String a_code; - private long aime_id; - private String aime_a_code; - private String key_obj_type; - private boolean exec_vu; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/SpendCreditRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/SpendCreditRequest.java deleted file mode 100644 index 52d7164c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/SpendCreditRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.user; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class SpendCreditRequest extends BaseRequest { - private long pd_id; - private int[] my_qst_id; - private int[] my_qst_sts; - private int crdt_typ; - private int[] cmpgn_id; - private int[] cmpgn_pb; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/StartRequest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/StartRequest.java deleted file mode 100644 index 130eae2d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/request/user/StartRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.request.user; - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class StartRequest extends BaseRequest { - public long pd_id; - public int accept_idx; -}