diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt | 99 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt | 16 |
2 files changed, 90 insertions, 25 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt index 0038f4448..8a3eef8cd 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt @@ -6,14 +6,18 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.GardenAPI +import at.hannibal2.skyhanni.utils.ChatUtils.chat import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.NumberUtil.formatLong +import at.hannibal2.skyhanni.utils.SoundUtils +import at.hannibal2.skyhanni.utils.SoundUtils.playSound import at.hannibal2.skyhanni.utils.StringUtils.matchFirst import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object GardenCropMilestones { + private val patternGroup = RepoPattern.group("data.garden.milestone") private val cropPattern by patternGroup.pattern( "crop", @@ -24,6 +28,8 @@ object GardenCropMilestones { "§7Total: §a(?<name>.*)" ) + private val config get() = GardenAPI.config.cropMilestones + fun getCropTypeByLore(itemStack: ItemStack): CropType? { itemStack.getLore().matchFirst(cropPattern) { val name = group("name") @@ -47,6 +53,42 @@ object GardenCropMilestones { GardenCropMilestonesCommunityFix.openInventory(event.inventoryItems) } + fun onOverflowLevelUp(crop: CropType, oldLevel: Int, newLevel: Int) { + val customGoalLevel = ProfileStorageData.profileSpecific?.garden?.customGoalMilestone?.get(crop) ?: 0 + val goalReached = newLevel == customGoalLevel + + // TODO utils function that is shared with Garden Level Display + val rewards = buildList { + add(" §r§8+§aRespect from Elite Farmers and SkyHanni members :)") + add(" §r§8+§b1 Flexing Point") + if (newLevel % 5 == 0) + add(" §r§7§8+§d2 SkyHanni User Luck") + } + + val messages = listOf( + "§r§3§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬§r", + " §r§b§lGARDEN MILESTONE §3${crop.cropName} §8$oldLevel➜§3$newLevel§r", + if (goalReached) + listOf( + "", + " §r§d§lGOAL REACHED!", + "", + ).joinToString("\n") + else + "", + " §r§a§lREWARDS§r", + rewards.joinToString("\n"), + "§r§3§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬§r" + ) + + chat(messages.joinToString("\n"), false) + + if (goalReached) + chat("§e§lYou have reached your milestone goal of §b§l${customGoalLevel} §e§lin the §b§l${crop.cropName} §e§lcrop!", false) + + SoundUtils.createSound("random.levelup", 1f, 1f).playSound() + } + var cropMilestoneData: Map<CropType, List<Int>> = emptyMap() val cropCounter: MutableMap<CropType, Long>? get() = GardenAPI.storage?.cropCounter @@ -58,50 +100,81 @@ object GardenCropMilestones { cropCounter?.set(this, counter) } - fun CropType.isMaxed(): Boolean { + fun CropType.isMaxed(useOverflow: Boolean): Boolean { + if (useOverflow) return false + // TODO change 1b val maxValue = cropMilestoneData[this]?.sum() ?: 1_000_000_000 // 1 bil for now return getCounter() >= maxValue } - fun getTierForCropCount(count: Long, crop: CropType): Int { + fun getTierForCropCount(count: Long, crop: CropType, allowOverflow: Boolean = false): Int { var tier = 0 var totalCrops = 0L val cropMilestone = cropMilestoneData[crop] ?: return 0 + val last = cropMilestone.last() + for (tierCrops in cropMilestone) { totalCrops += tierCrops - if (totalCrops > count) { + if (totalCrops >= count) { return tier } tier++ } + if (allowOverflow) { + while (totalCrops < count) { + totalCrops += last + if (totalCrops >= count) { + return tier + } + tier++ + } + } return tier } fun getMaxTier() = cropMilestoneData.values.firstOrNull()?.size ?: 0 - fun getCropsForTier(requestedTier: Int, crop: CropType): Long { + fun getCropsForTier(requestedTier: Int, crop: CropType, allowOverflow: Boolean = false): Long { var totalCrops = 0L var tier = 0 val cropMilestone = cropMilestoneData[crop] ?: return 0 + val definedTiers = cropMilestone.size + + if (requestedTier <= definedTiers || !allowOverflow) { + for (tierCrops in cropMilestone) { + totalCrops += tierCrops + tier++ + if (tier == requestedTier) { + return totalCrops + } + } + + return if (!allowOverflow) 0 else totalCrops + } + + for (tierCrops in cropMilestone) { totalCrops += tierCrops tier++ - if (tier == requestedTier) { - return totalCrops - } } - return 0 + val additionalTiers = requestedTier - definedTiers + + val lastIncrement = cropMilestone.last().toLong() + + totalCrops += lastIncrement * additionalTiers + + return totalCrops } - fun CropType.progressToNextLevel(): Double { + fun CropType.progressToNextLevel(allowOverflow: Boolean = false): Double { val progress = getCounter() - val startTier = getTierForCropCount(progress, this) - val startCrops = getCropsForTier(startTier, this) - val end = getCropsForTier(startTier + 1, this).toDouble() - return (progress - startCrops) / (end - startCrops) + val startTier = getTierForCropCount(progress, this, allowOverflow) + val startCrops = getCropsForTier(startTier, this, allowOverflow) + val end = getCropsForTier(startTier + 1, this, allowOverflow) + return (progress - startCrops).toDouble() / (end - startCrops) } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt index c52878003..fdfd3ca96 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt @@ -91,10 +91,7 @@ object GardenCropMilestonesCommunityFix { // debug("crop: $crop") // debug("realTier: $realTier") - val guessNextMax = GardenCropMilestones.getCropsForTier( - realTier + 1, - crop - ) - GardenCropMilestones.getCropsForTier(realTier, crop) + val guessNextMax = GardenCropMilestones.getCropsForTier(realTier + 1, crop) - GardenCropMilestones.getCropsForTier(realTier, crop) // debug("guessNextMax: ${guessNextMax.addSeparators()}") val nextMax = amountPattern.matchMatcher(next) { group("max").formatLong() @@ -105,7 +102,7 @@ object GardenCropMilestonesCommunityFix { wrongData.add("$crop:$realTier:${nextMax.addSeparators()}") } - val guessTotalMax = GardenCropMilestones.getCropsForTier(46, crop) + val guessTotalMax = GardenCropMilestones.getCropsForTier(46, crop) // no need to overflow here // println("guessTotalMax: ${guessTotalMax.addSeparators()}") val totalMax = amountPattern.matchMatcher(total) { group("max").formatLong() @@ -163,13 +160,8 @@ object GardenCropMilestonesCommunityFix { } private fun tryFix(crop: CropType, tier: Int, amount: Int): Boolean { - val guessNextMax = GardenCropMilestones.getCropsForTier(tier + 1, crop) - GardenCropMilestones.getCropsForTier( - tier, - crop - ) - if (guessNextMax.toInt() == amount) { - return false - } + val guessNextMax = GardenCropMilestones.getCropsForTier(tier + 1, crop) - GardenCropMilestones.getCropsForTier(tier, crop) + if (guessNextMax.toInt() == amount) return false GardenCropMilestones.cropMilestoneData = GardenCropMilestones.cropMilestoneData.editCopy { fix(crop, this, tier, amount) } |