diff options
| author | Fazfoxy <78978526+Fazfoxy@users.noreply.github.com> | 2024-10-20 22:43:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-20 23:43:44 +0200 |
| commit | 4deda67db56b237f277df8b41cedc052bba0d3fb (patch) | |
| tree | cea29d39df5098f37c91d74c5c113a78242f657c | |
| parent | 8bee426a943409fcd90182791d46ca807c23264a (diff) | |
| download | SkyHanni-4deda67db56b237f277df8b41cedc052bba0d3fb.tar.gz SkyHanni-4deda67db56b237f277df8b41cedc052bba0d3fb.tar.bz2 SkyHanni-4deda67db56b237f277df8b41cedc052bba0d3fb.zip | |
Fix: item stars + Estimated Item Value issues (#2758)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt | 10 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt index 05b0d46c7..3b94d84eb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt @@ -59,12 +59,10 @@ object ItemStars { private fun ItemStack.grabStarCount(): Int? { val internalName = getInternalNameOrNull() ?: return null - val baseStars = getDungeonStarCount() ?: getStarCount() ?: return null - if (internalName.isKuudraArmor()) { - val tier = internalName.getKuudraTier() ?: return baseStars - return baseStars + tier * 10 - } - return baseStars + val baseStars = getDungeonStarCount() ?: getStarCount() + if (!internalName.isKuudraArmor()) return baseStars + val tier = internalName.getKuudraTier() ?: return baseStars + return (baseStars ?: 0) + (tier-1) * 10 } private fun isEnabled() = LorenzUtils.inSkyBlock && config.itemStars diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt index e268f6f64..df9d02911 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt @@ -479,7 +479,7 @@ object EstimatedItemValueCalculator { ): Pair<EssenceItemUtils.EssenceUpgradePrice, Pair<Int, Int>>? { var totalStars = inputStars val (price, maxStars) = if (internalName.isKuudraArmor()) { - val tier = internalName.getKuudraTier() ?: 0 + val tier = (internalName.getKuudraTier() ?: 0) -1 totalStars += tier * 10 var remainingStars = totalStars |