From c97ab62faaefbd9f2c4f07d18ebd314c143f1482 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 6 Jan 2024 14:19:33 +0700 Subject: [PATCH] Display whenever upgrade reached bonus limit --- .../ru/dbotthepony/mc/otm/datagen/lang/English.kt | 4 +++- .../ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 ++ .../ru/dbotthepony/mc/otm/capability/Upgrades.kt | 14 ++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index b59724bc3..7664ba033 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -825,13 +825,15 @@ private fun gui(provider: MatteryLanguageProvider) { gui("upgrades", "Upgrades") gui("upgrades.current", "Active upgrades:") - gui("upgrade.speed", "Operation speed: %s%%") + gui("upgrade.speed", "Operating speed: %s%%") + gui("upgrade.speed_limit", "Operating speed: %s%% (limit)") gui("upgrade.processing_items", "Items processed per cycle: +%s") gui("upgrade.energy_storage_flat", "Energy capacity: +%s") gui("upgrade.matter_storage_flat", "Matter capacity: +%s") gui("upgrade.energy_storage", "Energy capacity: +%s%%") gui("upgrade.matter_storage", "Matter capacity: +%s%%") gui("upgrade.energy_consumed", "Energy consumption: %s%%") + gui("upgrade.energy_consumed_limit", "Energy consumption: %s%% (limit)") gui("upgrade.energy_throughput_flat", "Energy throughput: +%s") gui("upgrade.energy_throughput", "Energy throughput: +%s%%") gui("upgrade.failsafe", "Failure chance: %s%%") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index f529af7e8..7773ed4a8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -828,12 +828,14 @@ private fun gui(provider: MatteryLanguageProvider) { gui("upgrades", "Улучшения") gui("upgrades.current", "Активные улучшения:") gui("upgrade.speed", "Скорость работы: %s%%") + gui("upgrade.speed_limit", "Скорость работы: %s%% (предел)") gui("upgrade.processing_items", "Работы за цикл: +%s") gui("upgrade.energy_storage_flat", "Хранилище энергии: +%s") gui("upgrade.matter_storage_flat", "Хранилище материи: +%s") gui("upgrade.energy_storage", "Хранилище энергии: +%s%%") gui("upgrade.matter_storage", "Хранилище материи: +%s%%") gui("upgrade.energy_consumed", "Потребление энергии: %s%%") + gui("upgrade.energy_consumed_limit", "Потребление энергии: %s%% (предел)") gui("upgrade.energy_throughput_flat", "Пропускная способность энергии: +%s") gui("upgrade.energy_throughput", "Пропускная способность энергии: +%s%%") gui("upgrade.failsafe", "Шанс неудачи: %s%%") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt index 2669485f4..759743990 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt @@ -104,10 +104,13 @@ fun IMatteryUpgrade.addUpgradeTooltipLines(tooltips: MutableCollection= 0.01) { - tooltips.add(TranslatableComponent("otm.gui.upgrade.speed", TextComponent("+" + (speedBonus.coerceIn(MachinesConfig.Upgrades.MIN_SPEED, MachinesConfig.Upgrades.MAX_SPEED) * 100.0).toInt().toString()).withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY)) + tooltips.add(TranslatableComponent("otm.gui.upgrade.speed$speedBonusLimit", TextComponent("+" + (actualSpeedBonus * 100.0).toInt().toString()).withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY)) } else if (speedBonus <= -0.01) { - tooltips.add(TranslatableComponent("otm.gui.upgrade.speed", TextComponent((speedBonus.coerceIn(MachinesConfig.Upgrades.MIN_SPEED, MachinesConfig.Upgrades.MAX_SPEED) * 100.0).toInt().toString()).withStyle(ChatFormatting.DARK_RED)).withStyle(ChatFormatting.GRAY)) + tooltips.add(TranslatableComponent("otm.gui.upgrade.speed$speedBonusLimit", TextComponent((actualSpeedBonus * 100.0).toInt().toString()).withStyle(ChatFormatting.DARK_RED)).withStyle(ChatFormatting.GRAY)) } if (processingItems != 0) { @@ -130,10 +133,13 @@ fun IMatteryUpgrade.addUpgradeTooltipLines(tooltips: MutableCollection= positiveBound) { - tooltips.add(TranslatableComponent("otm.gui.upgrade.energy_consumed", TextComponent("+" + (energyConsumed.coerceIn(MachinesConfig.Upgrades.MIN_ENERGY, MachinesConfig.Upgrades.MAX_ENERGY) * 100).toString(0)).withStyle(ChatFormatting.DARK_RED)).withStyle(ChatFormatting.GRAY)) + tooltips.add(TranslatableComponent("otm.gui.upgrade.energy_consumed$consumedLimit", TextComponent("+" + (actualEnergyConsumed * 100).toString(0)).withStyle(ChatFormatting.DARK_RED)).withStyle(ChatFormatting.GRAY)) } else if (energyConsumed <= negativeBound) { - tooltips.add(TranslatableComponent("otm.gui.upgrade.energy_consumed", TextComponent((energyConsumed.coerceIn(MachinesConfig.Upgrades.MIN_ENERGY, MachinesConfig.Upgrades.MAX_ENERGY) * 100).toString(0)).withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY)) + tooltips.add(TranslatableComponent("otm.gui.upgrade.energy_consumed$consumedLimit", TextComponent((actualEnergyConsumed * 100).toString(0)).withStyle(ChatFormatting.DARK_GREEN)).withStyle(ChatFormatting.GRAY)) } if (energyThroughputFlat != Decimal.ZERO) {