From 5e336aba9e00773fca8a3e29119f1bc77d9a106a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 22 May 2024 13:40:00 -0400 Subject: [PATCH] v2.4.1: 13 clover, sundial, and trap mechanism upgrade costs down --- core/src/main/assets/messages/items/items.properties | 2 +- .../items/trinkets/DimensionalSundial.java | 4 ++-- .../items/trinkets/ThirteenLeafClover.java | 4 ++-- .../shatteredpixeldungeon/items/trinkets/TrapMechanism.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 1454030df..159c931e2 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1325,7 +1325,7 @@ items.trinkets.thirteenleafclover.name=thirteen leaf clover items.trinkets.thirteenleafclover.desc=Somehow stewing in the alchemy pot has caused this clover to grow a bunch of extra leaves! It's not really clear if this trinket is lucky or unlucky, perhaps this trinket will make your luck more chaotic?\n\nNormally when dealing or blocking damage, the game makes numbers closer to the average more common. At its current level this trinket has a _%d%%_ chance to invert this, making numbers closer to the maximum or minimum more likely to appear instead.\n\nThis trinket costs very little energy to upgrade. items.trinkets.trapmechanism.name=trap mechanism -items.trinkets.trapmechanism.desc=The core mechanism of one of the dungeon's pitfall traps, carefully carved out of the floor so it can be carried. It seems to be magically tied to the dungeon itself, making terrain more hazardous for you and the dungeon's inhabitants.\n\nAt its current level this trinket will make _%d%%_ of regular floors become filled with either traps or chasms instead. +items.trinkets.trapmechanism.desc=The core mechanism of one of the dungeon's pitfall traps, carefully carved out of the floor so it can be carried. It seems to be magically tied to the dungeon itself, making terrain more hazardous for you and the dungeon's inhabitants.\n\nAt its current level this trinket will make _%d%%_ of regular floors become filled with either traps or chasms instead.\n\nThis trinket costs relatively little energy to upgrade. items.trinkets.wondrousresin.name=wondrous resin items.trinkets.wondrousresin.desc=This shimmering blue resin appears to have the distilled essence of a cursed wand's magic. The magic from the alchemy pot has seemed to stabilize it somewhat, and its now affecting your wands.\n\nAt its current level this trinket will force cursed wand effects to become neutral or positive _%1$s%%_ of the time, and will cause uncursed wands to fire an additional cursed zap _%2$s%%_ of the time.\n\nThis trinket costs a moderately large amount of energy to upgrade. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/DimensionalSundial.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/DimensionalSundial.java index d2d8957aa..8b6d1fb81 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/DimensionalSundial.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/DimensionalSundial.java @@ -37,8 +37,8 @@ public class DimensionalSundial extends Trinket { @Override protected int upgradeEnergyCost() { - //5 -> 5(10) -> 5(15) -> 5(20) - return 5; + //5 -> 2(7) -> 3(10) -> 5(15) + return 2 + Math.round(level()*1.33f); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ThirteenLeafClover.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ThirteenLeafClover.java index 11e8427bc..c405d34e9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ThirteenLeafClover.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ThirteenLeafClover.java @@ -33,8 +33,8 @@ public class ThirteenLeafClover extends Trinket { @Override protected int upgradeEnergyCost() { - //5 -> 5(10) -> 5(15) -> 5(20) - return 5; + //5 -> 2(7) -> 3(10) -> 5(15) + return 2 + Math.round(level()*1.33f); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/TrapMechanism.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/TrapMechanism.java index 6a14d6e88..24f9f6764 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/TrapMechanism.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/TrapMechanism.java @@ -38,8 +38,8 @@ public class TrapMechanism extends Trinket { @Override protected int upgradeEnergyCost() { - //5 -> 8(13) -> 10(23) -> 12(35) - return 6+2*level(); + //5 -> 5(10) -> 7(17) -> 8(25) + return Math.round(5+1.67f*level()); } @Override