From 41f541c86c394bff669396fde5ace02521de3eed Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Sun, 25 Aug 2024 19:27:15 +0200 Subject: [PATCH] fix cooldown time with skymall perk (#48) --- beta-changelog.md | 2 +- .../dev/nyon/skylper/skyblock/cooldowns/MiningCooldown.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/beta-changelog.md b/beta-changelog.md index 5b4f99f..fcbc611 100644 --- a/beta-changelog.md +++ b/beta-changelog.md @@ -2,7 +2,7 @@ - add event forecast widget for dwarves, crystals and mineshafts ## Bug Fixes -none +- fix mining cooldown time with SkyMall perk on reduced cooldown ## Technical changes - make constructor parameters of TableHudWidget to variables to allow resizable table widgets \ No newline at end of file diff --git a/src/main/kotlin/dev/nyon/skylper/skyblock/cooldowns/MiningCooldown.kt b/src/main/kotlin/dev/nyon/skylper/skyblock/cooldowns/MiningCooldown.kt index 1d3e139..8bbd300 100644 --- a/src/main/kotlin/dev/nyon/skylper/skyblock/cooldowns/MiningCooldown.kt +++ b/src/main/kotlin/dev/nyon/skylper/skyblock/cooldowns/MiningCooldown.kt @@ -10,10 +10,12 @@ import dev.nyon.skylper.extensions.regex import dev.nyon.skylper.mcScope import dev.nyon.skylper.minecraft import dev.nyon.skylper.skyblock.data.api.HeartOfTheMountainApi +import dev.nyon.skylper.skyblock.data.api.SkyMallApi import dev.nyon.skylper.skyblock.data.online.Cooldowns import dev.nyon.skylper.skyblock.data.online.IslandGroups import dev.nyon.skylper.skyblock.data.online.ToolGroups import dev.nyon.skylper.skyblock.data.session.PlayerSessionData +import dev.nyon.skylper.skyblock.models.mining.SkyMallPerk import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.datetime.Clock @@ -95,7 +97,9 @@ object MiningCooldown : Cooldown { val abilityLevel = if (HeartOfTheMountainApi.data.peakOfTheMountainLevel == 0) 1 else 2 val cooldowns = Cooldowns.cooldowns.mining[HeartOfTheMountainApi.data.pickaxeAbility ?: return null] ?: return null - return cooldowns[abilityLevel].seconds + val normalTime = cooldowns[abilityLevel].seconds + val skyMallPerkEnabled = SkyMallApi.currentPerk == SkyMallPerk.REDUCED_COOLDOWN + return if (skyMallPerkEnabled) normalTime * 0.8 else normalTime } }