diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-10-26 12:30:02 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-10-26 12:30:02 +0200 |
commit | b6f9dc6caa77ef50e086fd50c6c32ebc69288eb8 (patch) | |
tree | 1532b36ad847210aae4968433cacbbe9f036f664 /src/main/java/at/hannibal2/skyhanni/data | |
parent | 2c061eb7fc7c6f8f4e5889504e6b390c71e6a269 (diff) | |
download | skyhanni-b6f9dc6caa77ef50e086fd50c6c32ebc69288eb8.tar.gz skyhanni-b6f9dc6caa77ef50e086fd50c6c32ebc69288eb8.tar.bz2 skyhanni-b6f9dc6caa77ef50e086fd50c6c32ebc69288eb8.zip |
code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 7db58cd62..c88a66bd2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -17,7 +17,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName -import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber @@ -157,8 +156,7 @@ object SackAPI { item.total = group("total") if (savingSacks) setSackItem(item.internalName, item.stored.formatNumber()) - val price: Long - if (isTrophySack) { + item.price = if (isTrophySack) { val internal = stack.getInternalName_old() val trophyFishName = internal.substringBeforeLast("_") .replace("_", "").lowercase() @@ -166,12 +164,11 @@ object SackAPI { val info = TrophyFishManager.getInfo(trophyFishName) val rarity = TrophyRarity.getByName(trophyRarityName) ?: TrophyRarity.BRONZE val filletValue = (info?.getFilletValue(rarity) ?: 0) * stored.toLong() - price = "MAGMA_FISH".asInternalName().sackPrice(filletValue.toString()) item.magmaFish = filletValue.toString() + "MAGMA_FISH".asInternalName().sackPrice(filletValue.toString()) } else { - price = internalName.sackPrice(stored).coerceAtLeast(0) + internalName.sackPrice(stored).coerceAtLeast(0) } - item.price = price if (isRuneSack) { @@ -361,4 +358,4 @@ enum class SackStatus { CORRECT, ALRIGHT, OUTDATED; -}
\ No newline at end of file +} |