archive
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[F] Fix jvm name clash

pull/29/head
Azalea 2024-04-02 02:07:39 -04:00
parent 02e2700e96
commit b41f3b9370
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,7 @@ fun WaccaServer.init() {
addItems(ls(ls(MUSIC_UNLOCK(), songId.int(), diff.int())), u, items) addItems(ls(ls(MUSIC_UNLOCK(), songId.int(), diff.int())), u, items)
useItems(itemUsed as List<List<Int>>, u, items) useItems(itemUsed as List<List<Int>>, u, items)
ls(u.getWp(), rp.item.findByUserAndType(u, TICKET()).map { it.ls() }) ls(u.moddedWp, rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
} }
"user/goods/purchase" { _, (uid, pid, count, purchaseType, cost, items) -> "user/goods/purchase" { _, (uid, pid, count, purchaseType, cost, items) ->
@ -369,7 +369,7 @@ fun WaccaServer.init() {
// WP Purchase = 2, Credit purchase = 1 // WP Purchase = 2, Credit purchase = 1
if (purchaseType == 2) useItems(ls(ls(WP(), 0, cost.int())), u, itemsMap) if (purchaseType == 2) useItems(ls(ls(WP(), 0, cost.int())), u, itemsMap)
ls(u.getWp(), rp.item.findByUserAndType(u, TICKET()).map { it.ls() }) ls(u.moddedWp, rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
} }
"user/rating/update" empty { _, (uid, newRating, songs) -> "user/rating/update" empty { _, (uid, newRating, songs) ->
@ -460,13 +460,13 @@ fun WaccaServer.init() {
// TODO: Test this // TODO: Test this
"user/vip/get" { _, (uid) -> "user/vip/get" { _, (uid) ->
val u = user(uid) ?: (404 - "User not found") val u = user(uid) ?: (404 - "User not found")
val vipDays = (u.getVipExpire().time - millis()) / (24 * 60 * 60 * 1000) val vipDays = (u.moddedVipExpire.time - millis()) / (24 * 60 * 60 * 1000)
ls(vipDays, ls(1, 1, "presents" - empty)) ls(vipDays, ls(1, 1, "presents" - empty))
} }
"user/vip/start" { _, (uid, cost, days) -> "user/vip/start" { _, (uid, cost, days) ->
val u = user(uid) ?: (404 - "User not found") val u = user(uid) ?: (404 - "User not found")
rp.user.save(u.apply { vipExpireTime = Date(millis() + days.int() * (24 * 60 * 60 * 1000)) }) rp.user.save(u.apply { vipExpireTime = Date(millis() + days.int() * (24 * 60 * 60 * 1000)) })
ls(u.getVipExpire().sec, "presents" - empty) ls(u.moddedVipExpire.sec, "presents" - empty)
} }
} }

8
src/main/java/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt
View File

@ -60,13 +60,13 @@ class WaccaUser : BaseEntity(), IUserData {
override var totalScore = 0L override var totalScore = 0L
fun lStatus() = ls(card?.extId, fun lStatus() = ls(card?.extId,
userName, 1, xp, danLevel, danType, getWp(), ls(0, 0, 0), loginCount, loginCountDays, userName, 1, xp, danLevel, danType, moddedWp, ls(0, 0, 0), loginCount, loginCountDays,
(loginCount - 1).coerceAtLeast(0), loginCountDaysConsec, getVipExpire().sec, loginCountToday, this.playerRating (loginCount - 1).coerceAtLeast(0), loginCountDaysConsec, moddedVipExpire.sec, loginCountToday, this.playerRating
) )
fun getVipExpire() = val moddedVipExpire get() =
if (card?.aquaUser?.gameOptions?.waccaAlwaysVip == true) "2077-01-01".isoDate().toDate() if (card?.aquaUser?.gameOptions?.waccaAlwaysVip == true) "2077-01-01".isoDate().toDate()
else vipExpireTime else vipExpireTime
fun getWp() = if (card?.aquaUser?.gameOptions?.waccaInfiniteWp == true) 999999 else wp val moddedWp get() = if (card?.aquaUser?.gameOptions?.waccaInfiniteWp == true) 999999 else wp
} }