From 5c86720a0932f60447ecd891c566d24ef7c3551c Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Wed, 31 May 2023 23:57:04 +0300 Subject: [PATCH] Added %level_previous% and %level_previous_numeral% placeholders to all levellable instances --- .../kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt | 2 ++ .../com/willfp/ecoskills/gui/components/SkillLevelComponent.kt | 2 ++ .../main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt | 2 ++ .../src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt | 2 ++ .../src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt | 2 ++ 5 files changed, 10 insertions(+) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt index e454aa9..6147034 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt @@ -32,6 +32,8 @@ class SkillIcon( .replace("%level%", level.toString()) .replace("%level_numeral%", level.toNumeral()) .replace("%skill%", skill.name) + .replace("%level_previous%", (level-1).toString()) + .replace("%level_previous_numeral%", (level-1).toNumeral()) ) addLoreLines( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillLevelComponent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillLevelComponent.kt index bc23e29..2fd48c5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillLevelComponent.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillLevelComponent.kt @@ -36,6 +36,8 @@ class SkillLevelComponent( .replace("%skill%", skill.name) .replace("%level%", level.toString()) .replace("%level_numeral%", level.toNumeral()) + .replace("%level_previous%", (level-1).toString()) + .replace("%level_previous_numeral%", (level-1).toNumeral()) ) .addLoreLines( skill.addPlaceholdersInto( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt index 8d0d1c5..1bd5de4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt @@ -26,6 +26,8 @@ class StatIcon( .replace("%level%", level.toString()) .replace("%level_numeral%", level.toNumeral()) .replace("%stat%", stat.name) + .replace("%level_previous%", (level-1).toString()) + .replace("%level_previous_numeral%", (level-1).toNumeral()) ) addLoreLines( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt index 25d755d..499a2dd 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt @@ -164,6 +164,8 @@ class Skill( .replace("%skill%", skill.name) .replace("%level%", level.toString()) .replace("%level_numeral%", level.toNumeral()) + .replace("%level_previous%", (level-1).toString()) + .replace("%level_previous_numeral%", (level-1).toNumeral()) .injectRewardPlaceholders(level) // Replace placeholders in the strings with their actual values. diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt index 989ca47..2522e90 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/Stat.kt @@ -36,6 +36,8 @@ class Stat( .replace("%stat%", this.name) .replace("%level%", level.toString()) .replace("%level_numeral%", level.toNumeral()) + .replace("%level_previous%", (level-1).toString()) + .replace("%level_previous_numeral%", (level-1).toNumeral()) }.formatEco(player) }