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

Revert "[+] Detailed ranks" 

This reverts commit a9893379f4.
pull/23/head
Azalea 2024-03-14 23:21:30 -04:00
parent 8def9e8931
commit 0100140dc0
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/icu/samnyan/aqua/net/games/Models.kt
View File

@ -19,7 +19,6 @@ data class GenericGameSummary(
val rating: Int,
val ratingHighest: Int,
val ranks: List<RankCount>,
val detailedRanks: Map<Int, Map<String, Int>>,
val maxCombo: Int,
val fullCombo: Int,
val allPerfect: Int,

20
src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
View File

@ -95,20 +95,11 @@ fun genericUserSummary(
val user = userDataRepo.findByCard(card) ?: (404 - "Game data not found")
val plays = userPlaylogRepo.findByUserCardExtId(card.extId)
// Detailed ranks: Find the number of each rank in each level category
// map<level, map<rank, count>>
// TODO: Not all games have difficulty from 1 to 15
val detailedRanks = (1..15).associateWith { lvl ->
shownRanks.associate { (_, v) -> v to 0 }.toMutableMap().also { ranks ->
plays.filter { lvl < it.level && it.level < lvl + 1 }.forEach {
shownRanks.find { (s, _) -> it.achievement > s }?.let { (_, v) -> ranks[v] = ranks[v]!! + 1 }
}
}
}
// Collapse detailed ranks to get non-detailed ranks map<rank, count>
val ranks = detailedRanks.values.first().keys.associateWith { rank ->
detailedRanks.values.sumOf { it[rank] ?: 0 }
// O(6n) ranks algorithm: Loop through the entire list of plays,
// count the number of each rank
val ranks = shownRanks.associate { (_, v) -> v to 0 }.toMutableMap()
plays.forEach {
shownRanks.find { (s, _) -> it.achievement > s }?.let { (_, v) -> ranks[v] = ranks[v]!! + 1 }
}
return GenericGameSummary(
@ -120,7 +111,6 @@ fun genericUserSummary(
rating = user.playerRating,
ratingHighest = user.highestRating,
ranks = ranks.map { (k, v) -> RankCount(k, v) },
detailedRanks = detailedRanks,
maxCombo = plays.maxOfOrNull { it.maxCombo } ?: 0,
fullCombo = plays.count { it.isFullCombo },
allPerfect = plays.count { it.isAllPerfect },