diff --git a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt index 39fda03b..d4b0401e 100644 --- a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt +++ b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt @@ -56,7 +56,7 @@ interface IGenericGamePlaylog { val date: Any val achievement: Int val maxCombo: Int - val totalCombo: Int + val isFullCombo: Boolean val beforeRating: Int val afterRating: Int } @@ -93,7 +93,7 @@ fun genericUserSummary( ratingHighest = user.highestRating, ranks = ranks.map { (k, v) -> RankCount(k, v) }, maxCombo = plays.maxOf { it.maxCombo }, - fullCombo = plays.count { it.totalCombo == it.maxCombo }, + fullCombo = plays.count { it.isFullCombo }, allPerfect = plays.count { it.achievement == 1010000 }, totalScore = user.totalScore, plays = plays.size, diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java index 79084e36..8509b498 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java @@ -157,11 +157,6 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { return score; } - @Override - public int getTotalCombo() { - return maxCombo; - } - @Override public int getAfterRating() { return playerRating; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java index ec06b129..5cdf11cf 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java @@ -128,8 +128,10 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { private int scoreRank; + // Maximum continuous combo that the player achieved in this play. private int maxCombo; + // Maximum achievable combo in the song. private int totalCombo; private int maxSync; @@ -268,4 +270,9 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { public Object getDate() { return playDate; } + + @Override + public boolean isFullCombo() { + return maxCombo == totalCombo; + } } diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java index 4486c847..9fb23c6a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java @@ -171,11 +171,6 @@ public class UserPlaylog implements Serializable, IGenericGamePlaylog { return techScore; } - @Override - public int getTotalCombo() { - return maxCombo; - } - @Override public int getAfterRating() { return playerRating;