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

v2.2.0: various small clarity improvements to blacksmith quest rewards

Browse Source
This commit is contained in:
Evan Debenham
2023-10-02 12:10:47 -04:00
parent e3022a6cd6
commit 2b081bc1b5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/assets/messages/actors/actors.properties
View File

@@ -964,10 +964,10 @@ actors.mobs.npcs.blacksmith.lost_pick=Are you kiddin' me? Where is my pickaxe?!
actors.mobs.npcs.blacksmith.quest_start_prompt=You ready to go down? Make sure you've got some free space for the gold.\n\n_I'm only lettin' you down der once!_
actors.mobs.npcs.blacksmith.enter_yes=I'm Ready
actors.mobs.npcs.blacksmith.enter_no=Not Yet
actors.mobs.npcs.blacksmith.exit_warn_none=You done already? You've hardly got any gold at all!\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_low=You done already? Doesn't look like you've got a lot of gold.\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_med=You done? You've got some gold at least, but there's definitely more in the mine.\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_high=You done? Looks like you've got a good amount of gold, but I could use a bit more.\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_none=You done already? You've hardly got any gold at all! You should be able to get _40 pieces._\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_low=You done already? Doesn't look like you've got a lot of gold.You should be able to get _40 pieces._\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_med=You done? You've got some gold at least, but there's definitely more in the mine. You should be able to get _40 pieces._\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_high=You done? Looks like you've got a good amount of gold, but I could use a bit more. You should be able to get _40 pieces._\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_full=You done? You've got lots of gold, but make sure you haven't left any of your gear behind.\n\n_Remember, I'm not lettin' you back in once you come up._
actors.mobs.npcs.blacksmith.exit_warn_crystal=That giant crystal's still down there too. I'll pay extra if you destroy it.
actors.mobs.npcs.blacksmith.exit_warn_fungi=That giant mushroom's still down there too. I'll pay extra if you kill it.

2
core/src/main/assets/messages/windows/windows.properties
View File

@@ -4,7 +4,7 @@ windows.wndblacksmith.reforge=_Reforge (%d favor):_ I can reforge two of the sam
windows.wndblacksmith.harden=_Harden (%d favor):_ I can harden an identified weapon or armor, so it's easier to keep an enchantment or glyph.
windows.wndblacksmith.upgrade=_Upgrade (%d favor):_ If you've got an identified item below +3 I can upgrade it for you.
windows.wndblacksmith.smith=_Smith (%d favor):_ I can try forging a weapon or armor for you from scratch. It'll be higher tier and probably upgraded, and you'll get some choice over what you get.
windows.wndblacksmith.cashout=_Cash Out (%d favor):_ I can just give you some regular gold I've got lyin' around.
windows.wndblacksmith.cashout=_Cash Out (all favor):_ I can just give you some regular gold I've got lyin' around. 1 for each point of favor.
windows.wndblacksmith$wndreforge.message=Okay, I can reforge two identified items of the same type and turn them into one of a better quality.
windows.wndblacksmith$wndreforge.prompt=Reforge an item
windows.wndblacksmith$wndreforge.reforge=Reforge them

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
View File

@@ -198,7 +198,7 @@ public class Blacksmith extends NPC {
}
});
} else if (Quest.favor > 0) {
} else if (Quest.favor > 0 || Quest.pickaxe != null && Statistics.questScores[2] >= 2500) {
Game.runOnRenderThread(new Callback() {
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java
View File

@@ -136,7 +136,7 @@ public class WndBlacksmith extends Window {
smith.enable(Blacksmith.Quest.favor >= 2000);
buttons.add(smith);
RedButton cashOut = new RedButton(Messages.get(this, "cashout", Blacksmith.Quest.favor), 6){
RedButton cashOut = new RedButton(Messages.get(this, "cashout"), 6){
@Override
protected void onClick() {
new Gold(Blacksmith.Quest.favor).doPickUp(Dungeon.hero, Dungeon.hero.pos);