diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index ff29d2cbd..435dfb3bc 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1298,7 +1298,7 @@ items.stones.stoneofshock.desc=This runestone unleashes a blast of electrical en ###trinkets items.trinkets.dimensionalsundial.name=dimensional sundial items.trinkets.dimensionalsundial.warning=Your sundial isn't casting a shadow, you feel uneasy. -items.trinkets.dimensionalsundial.desc=This small handheld sundial is somehow able to cast a shadow in the depths of the dungeon, even if you aren't holding it upright. Even more strangely, the shadow's position seems to have no relation to the sun in this world. When no shadow is cast, the sundial seems to attract danger.\n\nAt its current level, this trinket will increase the spawning rate of enemies by _%d%%_ when it is nighttime in real life (9pm to 7am).\n\nThis trinket costs relatively little energy to upgrade. +items.trinkets.dimensionalsundial.desc=This small handheld sundial is somehow able to cast a shadow in the depths of the dungeon, even if you aren't holding it upright. Even more strangely, the shadow's position seems to have no relation to the sun in this world. When no shadow is cast, the sundial seems to attract danger.\n\nAt its current level, this trinket will increase the spawning rate of enemies by _%d%%_ when it is nighttime in real life (9pm to 7am).\n\nThis trinket costs very little energy to upgrade. items.trinkets.exoticcrystals.name=exotic crystals items.trinkets.exoticcrystals.desc=These small pink crystals have the same shape as crystals of alchemical energy. While they can't be used for energy directly, they seem to be somehow influencing the potions and scrolls you find.\n\nAt its current level this trinket will replace _%s%%_ of potion or scroll drops with their exotic equivalents. This does not affect potions of strength, scrolls of upgrade, or items that are generated to help solve hazard rooms. @@ -1310,10 +1310,10 @@ items.trinkets.mimictooth.name=mimic tooth items.trinkets.mimictooth.desc=This large sharp tooth must have been pulled from a very unhappy mimic. It seems to be influencing the mimics of the dungeon, making them more frequent and dangerous.\n\nAt its current level this trinket will make all kinds of mimic _%1$sx_ more common, will make mimics much more difficult to detect, and will give each floor a _%2$s%%_ chance to contain an ebony mimic. items.trinkets.mossyclump.name=mossy clump -items.trinkets.mossyclump.desc=This clump of wet moss seems to hold onto its moisture no matter how hard you squeeze it. It seems to be magically tied to the dungeon itself, making grass and water more likely to appear.\n\nAt its current level this trinket will make _%d%%_ of regular floors become filled with either water or grass instead.\n\nThis trinket costs a relatively large amount of energy to upgrade. +items.trinkets.mossyclump.desc=This clump of wet moss seems to hold onto its moisture no matter how hard you squeeze it. It seems to be magically tied to the dungeon itself, making grass and water more likely to appear.\n\nAt its current level this trinket will make _%d%%_ of regular floors become filled with either water or grass instead.\n\nThis trinket costs a very large amount of energy to upgrade. items.trinkets.parchmentscrap.name=parchment scrap -items.trinkets.parchmentscrap.desc=This little scrap of parchment looks like it came from a scroll. It has retained some of its magic, and it seems to be influencing weapons and armor found in the dungeon.\n\nAt its current level this trinket will make enchantments and glyphs _%dx_ as common, and curses on weapons and armor _%sx_ as common. Curses on wands, rings, or artifacts are not affected.\n\nThis trinket costs a relatively large amount of energy to upgrade. +items.trinkets.parchmentscrap.desc=This little scrap of parchment looks like it came from a scroll. It has retained some of its magic, and it seems to be influencing weapons and armor found in the dungeon.\n\nAt its current level this trinket will make enchantments and glyphs _%dx_ as common, and curses on weapons and armor _%sx_ as common. Curses on wands, rings, or artifacts are not affected.\n\nThis trinket costs a moderately large amount of energy to upgrade. items.trinkets.petrifiedseed.name=petrified seed items.trinkets.petrifiedseed.desc=This seed has been fossilised, either by slow geological processes or by magic. The seed seems to be magically influencing the flora of the dungeon, occasionally replacing plant seeds with runestones.\n\nAt its current level this trinket will cause trampled grass to drop runestones instead of seeds _%1$d%%_ of the time, and will also cause high grass to drop items _%2$d%%_ more often. @@ -1322,13 +1322,13 @@ items.trinkets.ratskull.name=rat skull items.trinkets.ratskull.desc=This macabre trinket isn't much larger than the skull of a normal rat, which is somehow a rarity down in this dungeon. The skull's magical influence seems to attract the more rare denizens of the dungeon, making them appear far more often.\n\nAt its current level this trinket will make rare exotic enemies _%dx_ as likely to appear. The skull is only half as effective at attracting crystal mimics and armored statues, however. 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 relatively little energy to upgrade. +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.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 post has seemed to stabilize it somewhat, and its now affecting your wands.\n\nAt its current level this trinket will cause cursed wand effects to be forced 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 relatively large amount of energy to upgrade. +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 post has seemed to stabilize it somewhat, and its now affecting your wands.\n\nAt its current level this trinket will cause cursed wand effects to be forced 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. items.trinkets.trinketcatalyst.name=magical catalyst items.trinkets.trinketcatalyst.window_text=The water begins to glow as you add the catalyst. There are a few nearby items you could imbue with energy to turn into a magical trinket. 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 4af03aedb..d2d8957aa 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) -> 7(17) -> 8(25) - return Math.round(5+1.67f*level()); + //5 -> 5(10) -> 5(15) -> 5(20) + return 5; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/MossyClump.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/MossyClump.java index e77b55bd0..f7acac22c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/MossyClump.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/MossyClump.java @@ -40,6 +40,8 @@ public class MossyClump extends Trinket { protected int upgradeEnergyCost() { //5 -> 10(15) -> 15(30) -> 20(50) return 10+5*level(); + //5 -> 10(15) -> 20(35) -> 30(65) + //return 10+10*level(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/PetrifiedSeed.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/PetrifiedSeed.java index a583b4998..f4c6c15f4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/PetrifiedSeed.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/PetrifiedSeed.java @@ -49,7 +49,7 @@ public class PetrifiedSeed extends Trinket { if (level <= 0){ return 1f; } else { - return 1f + .4f*level/3f; + return 1f + .25f*level/3f; } } @@ -59,7 +59,7 @@ public class PetrifiedSeed extends Trinket { //when accounting for boosts, we effectively get: //stones: 25/50/75/100% - //seeds: 75/62/51/40% + //seeds: 75/58/38/25% public static float stoneInsteadOfSeedChance( int level ){ switch (level){ default: @@ -67,11 +67,11 @@ public class PetrifiedSeed extends Trinket { case 0: return 0.25f; case 1: - return 0.45f; + return 0.46f; case 2: - return 0.6f; + return 0.65f; case 3: - return 0.7f; + return 0.8f; } } } 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 4b5bc5d05..11e8427bc 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) -> 7(17) -> 8(25) - return Math.round(5+1.67f*level()); + //5 -> 5(10) -> 5(15) -> 5(20) + return 5; } @Override