From 5f453e614a467ba1d31376f5dd119591af28e470 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 15 Feb 2023 17:29:22 -0500 Subject: [PATCH] v2.0.0: fixed hero name not being capitalized in NPC dialogue --- .../shatteredpixeldungeon/actors/mobs/npcs/Ghost.java | 6 +++--- .../shatteredpixeldungeon/actors/mobs/npcs/Imp.java | 8 ++++---- .../actors/mobs/npcs/ImpShopkeeper.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java | 8 ++++---- .../shatteredpixeldungeon/items/artifacts/DriedRose.java | 2 +- .../shatteredpixeldungeon/windows/WndWandmaker.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index e0d44c51b..c09cfad6d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -170,13 +170,13 @@ public class Ghost extends NPC { switch (Quest.type){ case 1: default: questBoss = new FetidRat(); - txt_quest = Messages.get(this, "rat_1", Dungeon.hero.name()); break; + txt_quest = Messages.get(this, "rat_1", Messages.titleCase(Dungeon.hero.name())); break; case 2: questBoss = new GnollTrickster(); - txt_quest = Messages.get(this, "gnoll_1", Dungeon.hero.name()); break; + txt_quest = Messages.get(this, "gnoll_1", Messages.titleCase(Dungeon.hero.name())); break; case 3: questBoss = new GreatCrab(); - txt_quest = Messages.get(this, "crab_1", Dungeon.hero.name()); break; + txt_quest = Messages.get(this, "crab_1", Messages.titleCase(Dungeon.hero.name())); break; } questBoss.pos = Dungeon.level.randomRespawnCell( this ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java index 460d29c98..57d2062c7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java @@ -63,7 +63,7 @@ public class Imp extends NPC { } if (!Quest.given && Dungeon.level.visited[pos]) { if (!seenBefore) { - yell( Messages.get(this, "hey", Dungeon.hero.name() ) ); + yell( Messages.get(this, "hey", Messages.titleCase(Dungeon.hero.name()) ) ); } Notes.add( Notes.Landmark.IMP ); seenBefore = true; @@ -113,8 +113,8 @@ public class Imp extends NPC { }); } else { tell( Quest.alternative ? - Messages.get(this, "monks_2", Dungeon.hero.name()) - : Messages.get(this, "golems_2", Dungeon.hero.name()) ); + Messages.get(this, "monks_2", Messages.titleCase(Dungeon.hero.name())) + : Messages.get(this, "golems_2", Messages.titleCase(Dungeon.hero.name())) ); } } else { @@ -138,7 +138,7 @@ public class Imp extends NPC { public void flee() { - yell( Messages.get(this, "cya", Dungeon.hero.name()) ); + yell( Messages.get(this, "cya", Messages.titleCase(Dungeon.hero.name())) ); destroy(); sprite.die(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java index 39073e463..31974b04d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java @@ -39,9 +39,9 @@ public class ImpShopkeeper extends Shopkeeper { if (!seenBefore && Dungeon.level.heroFOV[pos]) { if (Dungeon.hero.buff(AscensionChallenge.class) == null) { - yell(Messages.get(this, "greetings", Dungeon.hero.name())); + yell(Messages.get(this, "greetings", Messages.titleCase(Dungeon.hero.name()))); } else { - yell(Messages.get(this, "greetings_ascent", Dungeon.hero.name())); + yell(Messages.get(this, "greetings_ascent", Messages.titleCase(Dungeon.hero.name()))); } seenBefore = true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java index 81737e75e..f1692ccf3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java @@ -125,13 +125,13 @@ public class Wandmaker extends NPC { String msg; switch(Quest.type){ case 1: default: - msg = Messages.get(this, "reminder_dust", Dungeon.hero.name()); + msg = Messages.get(this, "reminder_dust", Messages.titleCase(Dungeon.hero.name())); break; case 2: - msg = Messages.get(this, "reminder_ember", Dungeon.hero.name()); + msg = Messages.get(this, "reminder_ember", Messages.titleCase(Dungeon.hero.name())); break; case 3: - msg = Messages.get(this, "reminder_berry", Dungeon.hero.name()); + msg = Messages.get(this, "reminder_berry", Messages.titleCase(Dungeon.hero.name())); break; } Game.runOnRenderThread(new Callback() { @@ -154,7 +154,7 @@ public class Wandmaker extends NPC { msg1 += Messages.get(this, "intro_rogue"); break; case MAGE: - msg1 += Messages.get(this, "intro_mage", Dungeon.hero.name()); + msg1 += Messages.get(this, "intro_mage", Messages.titleCase(Dungeon.hero.name())); break; case HUNTRESS: msg1 += Messages.get(this, "intro_huntress"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 8498e6a22..f48e6b427 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -178,7 +178,7 @@ public class DriedRose extends Artifact { hero.sprite.operate(hero.pos); if (!firstSummon) { - ghost.yell( Messages.get(GhostHero.class, "hello", Dungeon.hero.name()) ); + ghost.yell( Messages.get(GhostHero.class, "hello", Messages.titleCase(Dungeon.hero.name())) ); Sample.INSTANCE.play( Assets.Sounds.GHOST ); firstSummon = true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java index fab7ba83f..2f4c5ae56 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java @@ -108,7 +108,7 @@ public class WndWandmaker extends Window { Dungeon.level.drop( reward, wandmaker.pos ).sprite.drop(); } - wandmaker.yell( Messages.get(this, "farewell", Dungeon.hero.name()) ); + wandmaker.yell( Messages.get(this, "farewell", Messages.titleCase(Dungeon.hero.name())) ); wandmaker.destroy(); wandmaker.sprite.die();