From d880102af484d8f2a4641e535efda61f54347d44 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 2 May 2025 13:39:35 -0400 Subject: [PATCH] v3.1.0: balance changes again to ferret tuft --- .../assets/messages/items/items.properties | 4 ++-- .../shatteredpixeldungeon/actors/Char.java | 2 +- .../items/trinkets/FerretTuft.java | 18 ++++++------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index fba85c393..dbeff31b4 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1417,8 +1417,8 @@ items.trinkets.eyeofnewt.stats_desc=At its current level this trinket will reduc items.trinkets.ferrettuft.name=ferret tuft items.trinkets.ferrettuft.desc=A tuft of silky white ferret fur, held together by a lime green ribbon tied into a bow. Ferrets are known for their agility, mischievousness, and lack of integrity. Some of that power seems to radiate from the trinket, enhancing the evasion of anything nearby. -items.trinkets.ferrettuft.typical_stats_desc=Typically this trinket will increase your evasion by _%1$d%%_, and the evasion of other characters by _%2$d%%_. -items.trinkets.ferrettuft.stats_desc=At its current level this trinket will increase your evasion by _%1$d%%_, and the evasion of other characters by _%2$d%%_. +items.trinkets.ferrettuft.typical_stats_desc=Typically this trinket will increase the evasion of all characters by _%1$d%%_. +items.trinkets.ferrettuft.stats_desc=At its current level this trinket will increase the evasion of all characters by _%1$d%%_. 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. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index e6284a2bd..6885851f9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -663,7 +663,7 @@ public abstract class Char extends Actor { // + 3%/5% defRoll *= 1.01f + 0.02f*Dungeon.hero.pointsInTalent(Talent.BLESS); } - defRoll *= FerretTuft.evasionMultiplier(defender == Dungeon.hero); + defRoll *= FerretTuft.evasionMultiplier(); return (acuRoll * accMulti) >= defRoll; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/FerretTuft.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/FerretTuft.java index 5d388ce38..30b055898 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/FerretTuft.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/FerretTuft.java @@ -39,27 +39,21 @@ public class FerretTuft extends Trinket { @Override public String statsDesc() { if (isIdentified()){ - return Messages.get(this, "stats_desc", - Math.round(100 * (evasionMultiplier(true, buffedLvl())-1f)), - Math.round(100 * (evasionMultiplier(false, buffedLvl())-1f))); + return Messages.get(this, "stats_desc", Math.round(100 * (evasionMultiplier(buffedLvl())-1f))); } else { - return Messages.get(this, "typical_stats_desc", - Math.round(100 * (evasionMultiplier(true, 0)-1f)), - Math.round(100 * (evasionMultiplier(false, 0)-1f))); + return Messages.get(this, "typical_stats_desc", Math.round(100 * (evasionMultiplier(0)-1f))); } } - public static float evasionMultiplier(boolean hero){ - return evasionMultiplier(hero, trinketLevel(FerretTuft.class)); + public static float evasionMultiplier(){ + return evasionMultiplier(trinketLevel(FerretTuft.class)); } - public static float evasionMultiplier(boolean hero, int level ){ + public static float evasionMultiplier(int level ){ if (level <= -1){ return 1; - } else if (hero) { - return 1 + 0.1f*(level+1); } else { - return 1 + 0.05f*(level+1); + return 1 + 0.15f*(level+1); } }