konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed hero name not being capitalized in NPC dialogue

Browse Source
This commit is contained in:
Evan Debenham
2023-02-15 17:29:22 -05:00
parent b0f09942d4
commit 5f453e614a
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java
+3 -3
View File
@@ -170,13 +170,13 @@ public class Ghost extends NPC {
switch (Quest.type){ switch (Quest.type){
case 1: default: case 1: default:
questBoss = new FetidRat(); 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: case 2:
questBoss = new GnollTrickster(); 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: case 3:
questBoss = new GreatCrab(); 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 ); questBoss.pos = Dungeon.level.randomRespawnCell( this );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java
+4 -4
View File
@@ -63,7 +63,7 @@ public class Imp extends NPC {
} }
if (!Quest.given && Dungeon.level.visited[pos]) { if (!Quest.given && Dungeon.level.visited[pos]) {
if (!seenBefore) { 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 ); Notes.add( Notes.Landmark.IMP );
seenBefore = true; seenBefore = true;
@@ -113,8 +113,8 @@ public class Imp extends NPC {
}); });
} else { } else {
tell( Quest.alternative ? tell( Quest.alternative ?
Messages.get(this, "monks_2", Dungeon.hero.name()) Messages.get(this, "monks_2", Messages.titleCase(Dungeon.hero.name()))
: Messages.get(this, "golems_2", Dungeon.hero.name()) ); : Messages.get(this, "golems_2", Messages.titleCase(Dungeon.hero.name())) );
} }
} else { } else {
@@ -138,7 +138,7 @@ public class Imp extends NPC {
public void flee() { public void flee() {
yell( Messages.get(this, "cya", Dungeon.hero.name()) ); yell( Messages.get(this, "cya", Messages.titleCase(Dungeon.hero.name())) );
destroy(); destroy();
sprite.die(); sprite.die();
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/ImpShopkeeper.java
+2 -2
View File
@@ -39,9 +39,9 @@ public class ImpShopkeeper extends Shopkeeper {
if (!seenBefore && Dungeon.level.heroFOV[pos]) { if (!seenBefore && Dungeon.level.heroFOV[pos]) {
if (Dungeon.hero.buff(AscensionChallenge.class) == null) { 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 { } else {
yell(Messages.get(this, "greetings_ascent", Dungeon.hero.name())); yell(Messages.get(this, "greetings_ascent", Messages.titleCase(Dungeon.hero.name())));
} }
seenBefore = true; seenBefore = true;
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+4 -4
View File
@@ -125,13 +125,13 @@ public class Wandmaker extends NPC {
String msg; String msg;
switch(Quest.type){ switch(Quest.type){
case 1: default: case 1: default:
msg = Messages.get(this, "reminder_dust", Dungeon.hero.name()); msg = Messages.get(this, "reminder_dust", Messages.titleCase(Dungeon.hero.name()));
break; break;
case 2: case 2:
msg = Messages.get(this, "reminder_ember", Dungeon.hero.name()); msg = Messages.get(this, "reminder_ember", Messages.titleCase(Dungeon.hero.name()));
break; break;
case 3: case 3:
msg = Messages.get(this, "reminder_berry", Dungeon.hero.name()); msg = Messages.get(this, "reminder_berry", Messages.titleCase(Dungeon.hero.name()));
break; break;
} }
Game.runOnRenderThread(new Callback() { Game.runOnRenderThread(new Callback() {
@@ -154,7 +154,7 @@ public class Wandmaker extends NPC {
msg1 += Messages.get(this, "intro_rogue"); msg1 += Messages.get(this, "intro_rogue");
break; break;
case MAGE: case MAGE:
msg1 += Messages.get(this, "intro_mage", Dungeon.hero.name()); msg1 += Messages.get(this, "intro_mage", Messages.titleCase(Dungeon.hero.name()));
break; break;
case HUNTRESS: case HUNTRESS:
msg1 += Messages.get(this, "intro_huntress"); msg1 += Messages.get(this, "intro_huntress");
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+1 -1
View File
@@ -178,7 +178,7 @@ public class DriedRose extends Artifact {
hero.sprite.operate(hero.pos); hero.sprite.operate(hero.pos);
if (!firstSummon) { 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 ); Sample.INSTANCE.play( Assets.Sounds.GHOST );
firstSummon = true; firstSummon = true;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class WndWandmaker extends Window {
Dungeon.level.drop( reward, wandmaker.pos ).sprite.drop(); 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.destroy();
wandmaker.sprite.die(); wandmaker.sprite.die();