diff --git a/hypixel-api b/hypixel-api index ee5396834..07c445088 160000 --- a/hypixel-api +++ b/hypixel-api @@ -1 +1 @@ -Subproject commit ee53968348449d178a6bc0eb9fd275ad22d9ee9b +Subproject commit 07c445088b6121e3b2051119cc7d2b82daaea5f3 diff --git a/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/CataCommand.kt b/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/CataCommand.kt index a76bf2d03..cb2ded66c 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/CataCommand.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/commands/impl/CataCommand.kt @@ -28,6 +28,7 @@ import gg.skytils.skytilsmod.Skytils.Companion.failPrefix import gg.skytils.skytilsmod.Skytils.Companion.mc import gg.skytils.skytilsmod.core.API import gg.skytils.skytilsmod.utils.* +import gg.skytils.skytilsmod.utils.NumberUtil.roundToPrecision import kotlinx.coroutines.launch import org.incendo.cloud.annotations.Argument import org.incendo.cloud.annotations.Command @@ -128,6 +129,11 @@ object CataCommand { ) val secrets = playerResponse?.achievements?.getOrDefault("skyblock_treasure_hunter", 0) ?: 0 + val comps = cataData.tier_completions.values + val masterComps = masterCataData?.tier_completions?.values ?: emptyList() + val runs = comps.sum() - (cataData.tier_completions["total"] ?: 0.0) + + masterComps.sum() - (masterCataData?.tier_completions?.get("total") ?: 0.0) + val secretsPerRun = ((profileData.dungeons?.secrets ?: 0.0) / runs).roundToPrecision(2) val classAvgOverflow = (archLevel + bersLevel + healerLevel + mageLevel + tankLevel) / 5.0 val classAvgCapped = @@ -268,6 +274,7 @@ object CataCommand { component .append("§a§l➜ Miscellaneous:\n") .append(" §aTotal Secrets Found: §l➡ §e${NumberUtil.nf.format(secrets)}\n") + .append(" §aSecrets/Run: §l➡ §e${NumberUtil.nf.format(secretsPerRun)}\n") .append( " §aBlood Mobs Killed: §l➡ §e${ NumberUtil.nf.format( diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/PartyFinderStats.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/PartyFinderStats.kt index cceba5fb8..ddbe4b3af 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/PartyFinderStats.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/PartyFinderStats.kt @@ -28,6 +28,7 @@ import gg.skytils.skytilsmod.Skytils.Companion.failPrefix import gg.skytils.skytilsmod.Skytils.Companion.mc import gg.skytils.skytilsmod.core.API import gg.skytils.skytilsmod.utils.* +import gg.skytils.skytilsmod.utils.NumberUtil.roundToPrecision import gg.skytils.skytilsmod.utils.NumberUtil.toRoman import gg.skytils.skytilsmod.utils.SkillUtils.level import kotlinx.coroutines.launch @@ -104,6 +105,12 @@ object PartyFinderStats { val name = playerResponse.formattedName val secrets = playerResponse.achievements.getOrDefault("skyblock_treasure_hunter", 0) + val comps = cataData.tier_completions.values + val masterComps = masterCataData?.tier_completions?.values ?: emptyList() + val runs = comps.sum() - (cataData.tier_completions["total"] ?: 0.0) + + masterComps.sum() - (masterCataData?.tier_completions?.get("total") ?: 0.0) + val secretsPerRun = ((profileData.dungeons?.secrets ?: 0.0) / runs).roundToPrecision(2) + val component = UMessage("&2&m--------------------------------\n").append( "$name §8» §dCata §9${ NumberUtil.nf.format(cataLevel) @@ -240,6 +247,7 @@ object PartyFinderStats { UTextComponent("§5Miscellanous: §7(Hover)\n\n").setHoverText( """ #§aTotal Secrets Found: §l§e${NumberUtil.nf.format(secrets)} + #§aSecrets Per Run: §l§e${NumberUtil.nf.format(secretsPerRun)} #§aBlood Mobs Killed: §l§e${NumberUtil.nf.format(bloodMobsKilled)} #§dMagical Power: §l§e$magicalPower """.trimMargin("#")