From 7f86047e7f5565deab278ad2866a6d753c1816a0 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 25 Nov 2023 04:15:16 +0100 Subject: made coin name and coin description independent functions --- .../features/fishing/tracker/FishingProfitTracker.kt | 12 +++++------- .../skyhanni/features/slayer/SlayerProfitTracker.kt | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt index d5433c9bf..e6f2a9a92 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt @@ -52,15 +52,13 @@ object FishingProfitTracker { ) } - override fun getCoinFormat(item: TrackedItem, numberColor: String): Pair> { + override fun getCoinName(item: TrackedItem) = "§6Fished Coins" + + override fun getCoinDescription(item: TrackedItem): List { val mobKillCoinsFormat = NumberUtil.format(item.totalAmount) - val gained = item.timesGained - val text = " $numberColor${gained}x §6Fished Coins§7: §6$mobKillCoinsFormat" - val lore = listOf( - "§7Killing mobs gives you coins (more with scavenger)", - "§7You got §e$mobKillCoinsFormat §7coins in total this way" + return listOf( + "§7You fished up §6$mobKillCoinsFormat coins §7already." ) - return text to lore } override fun getCustomPricePer(internalName: NEUInternalName): Double { diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt index 3e69cfcca..7a49e4ddd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt @@ -58,15 +58,14 @@ object SlayerProfitTracker { ) } - override fun getCoinFormat(item: TrackedItem, numberColor: String): Pair> { + override fun getCoinName(item: TrackedItem) = "§6Mob Kill Coins" + + override fun getCoinDescription(item: TrackedItem): List { val mobKillCoinsFormat = NumberUtil.format(item.totalAmount) - val gained = item.timesGained - val text = " $numberColor${gained}x §6Mob Kill Coins§7: §6$mobKillCoinsFormat" - val lore = listOf( - "§7Killing mobs gives you coins (more with scavenger)", - "§7You got §6$mobKillCoinsFormat coins §7in total this way" + return listOf( + "§7Killing mobs gives you coins (more with scavenger).", + "§7You got §6$mobKillCoinsFormat coins §7way." ) - return text to lore } } -- cgit