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

v2.2.0: multiple improvements to clarity and window flow for blacksmith

Browse Source
This commit is contained in:
Evan Debenham
2023-10-06 13:04:26 -04:00
parent b1058f5b08
commit fbebb12d93
5 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -955,7 +955,7 @@ actors.mobs.npcs.blacksmith.intro_quest_rogue=Hey Human! You look like a sneaky
actors.mobs.npcs.blacksmith.intro_quest_huntress=Hey Human! You look like a quick one.
actors.mobs.npcs.blacksmith.intro_quest_duelist=Hey Human! You look like a brave one.
actors.mobs.npcs.blacksmith.intro_quest_cleric=Hey Human! You look like an important one.
actors.mobs.npcs.blacksmith.intro_quest_start=Wanna be useful, eh? Yeah I got something you could do. I built dis workshop ontop of an old mine, it's just down dat ladder. Take dis pickaxe and mine me some _dark gold ore. 40 pieces_ should be enough. The rock down there is nice and soft so _you'll be able to mine through the walls with some effort._\n\nWhat do you mean, how am I gonna pay? You greedy...\n\nOk, ok, I can do some smithin' for you. Consider yourself lucky, I'm the only blacksmith around.
actors.mobs.npcs.blacksmith.intro_quest_start=Wanna be useful, eh? Yeah I got something you could do. I built dis workshop ontop of an old mine, it's just down dat ladder. Take dis pickaxe and mine me some _dark gold ore. 40 pieces_ should be enough. The rock down der is nice and soft so _you'll be able to mine through the walls with some effort._\n\nWhat do you mean, how am I gonna pay? You greedy...\n\nOk, ok, I can do some smithin' for you. Consider yourself lucky, I'm the only blacksmith around.
actors.mobs.npcs.blacksmith.intro_quest_crystal=Careful though, the mine's dangerous for a little human like you. It's been abandoned for a while, and bunch of crystals have started growing. They're shiny, but too fragile to be worth anythin', and they've got some magic things protecting 'em. They're pretty strong, so _be careful where you mine_ or you'll get their attention.\n\nThere's a _giant crystal_ somewhere too. It's a lot tougher, so be prepared for a fight if you start breakin' it. I'll bet smashing it will slow all the crystal growth down though, so I'll pay extra if you can do it.
actors.mobs.npcs.blacksmith.intro_quest_fungi=Careful though, the mine's dangerous for a little human like you. There's some sorta fungus monster that's been growing down there. It's got mushroom sentries that're really deadly if they see you, but they can't get up and chase you at least. _Keep out of sight_ if you want to stay alive.\n\nI'll pay extra if you can manage to take down the _biggest mushrom,_ but it'll take some real effort. It's connected to a bunch of mycelium nodes that're hidden in the walls. You'll have to break most of 'em before you can really damage it.
actors.mobs.npcs.blacksmith.intro_quest_gnoll=Careful though, the mine's dangerous for a little human like you. Some gnolls want the gold too and now they're wreckin' the place. They're stupid things, so their mining has caused all sorts of collapses and cave-ins. You'll have to mine though it, so _look for recently disturbed rock._\n\nI think one of the gnolls is causing most of the trouble, probably a _geomancer shaman_ or somethin'. I'll pay extra, if you can find and kill it, but I'm sure it'll fight back.

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

@@ -1041,7 +1041,7 @@ items.scrolls.scrollofupgrade.name=scroll of upgrade
items.scrolls.scrollofupgrade.inv_title=Upgrade an item
items.scrolls.scrollofupgrade.weaken_curse=The scroll of upgrade weakens the curse on your item.
items.scrolls.scrollofupgrade.remove_curse=The scroll of upgrade cleanses the curse on your item!
items.scrolls.scrollofupgrade.desc=This scroll will upgrade a single item, improving its quality. A wand will increase in power and number of charges, weapons and armor will deal and block more damage, and the effects of rings will intensify.\n\nThis scroll is even able to mitigate or sometimes totally dispel curse effects, though it is not as potent as a scroll of remove curse.\n\nThe magic of the scroll may also interfere with and erase enchantments on weapons and glyphs on armor. The chance for this begins when upgrading from +4, and will be guaranteed at +8 or higher.
items.scrolls.scrollofupgrade.desc=This scroll will upgrade a single item. Wands will increase in power and number of charges, weapons and armor will deal and block more damage, and the effects of rings will intensify. It can even weaken or sometimes totally dispel curses, though it is not as potent as a scroll of remove curse.\n\nUnfortunately, The upgrading magic can also erase enchantments or glyphs on higher level gear. The chance for this begins when upgrading from +4, and will be guaranteed at +8 or higher. If the item is hardened, this is increased to +6 and +10, and the hardening will be lost before the enchantment or glyph.

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

@@ -1,10 +1,20 @@
windows.wndblacksmith.prompt=Okay, a deal's a deal. Here's what I can do for you.\n\n_Current Favor: %d_
windows.wndblacksmith.pickaxe=_Pickaxe (%d favor):_ I guess I can give you the pickaxe back if you want. I've got plenty more.
windows.wndblacksmith.pickaxe_verify=You sure you want dis old thing? The rock around here isn't soft like in the mine, so you won't be able to do any more digging with it.
windows.wndblacksmith.pickaxe_free=Eh, you did a pretty good job, I'll give it to you for free.
windows.wndblacksmith.pickaxe_yes=Yes, I want it.
windows.wndblacksmith.pickaxe_no=Nevermind.
windows.wndblacksmith.reforge=_Reforge (%d favor):_ I can reforge two of the same type of identified item into one of a higher quality.
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.smith_verify=Alright, I'll get the forge warmed up and then you can pick what you want.
windows.wndblacksmith.smith_yes=Okay, warm the forge.
windows.wndblacksmith.smith_no=Nevermind.
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.cashout_verify=Okay so that's %d gold. I'm not doin' any more work for you after dis though!
windows.wndblacksmith.cashout_yes=Give me the gold.
windows.wndblacksmith.cashout_no=Nevermind.
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

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

@@ -194,7 +194,7 @@ public class Blacksmith extends NPC {
Game.runOnRenderThread(new Callback() {
@Override
public void call() {
GameScene.show( new WndBlacksmith.WndReforge( Blacksmith.this, Dungeon.hero ) );
GameScene.show( new WndBlacksmith.WndReforge( Blacksmith.this, null ) );
}
});
@@ -374,7 +374,7 @@ public class Blacksmith extends NPC {
//currently only the crystal quest is ready to play
//we still roll for quest type however, to ensure seed consistency
type = 1+Random.Int(1);
type = 3+Random.Int(1);
alternative = false;
given = false;

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

@@ -80,14 +80,27 @@ public class WndBlacksmith extends Window {
RedButton pickaxe = new RedButton(Messages.get(this, "pickaxe", pickaxeCost), 6){
@Override
protected void onClick() {
if (Blacksmith.Quest.pickaxe.doPickUp( Dungeon.hero )) {
GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", Blacksmith.Quest.pickaxe.name()) ));
} else {
Dungeon.level.drop( Blacksmith.Quest.pickaxe, Dungeon.hero.pos ).sprite.drop();
}
Blacksmith.Quest.favor -= pickaxeCost;
Blacksmith.Quest.pickaxe = null;
WndBlacksmith.this.hide();
GameScene.show(new WndOptions(
troll.sprite(),
Messages.titleCase( troll.name() ),
Messages.get(WndBlacksmith.class, "pickaxe_verify") + (pickaxeCost == 0 ? "\n\n" + Messages.get(WndBlacksmith.class, "pickaxe_free") : ""),
Messages.get(WndBlacksmith.class, "pickaxe_yes"),
Messages.get(WndBlacksmith.class, "pickaxe_no")
){
@Override
protected void onSelect(int index) {
if (index == 0){
if (Blacksmith.Quest.pickaxe.doPickUp( Dungeon.hero )) {
GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", Blacksmith.Quest.pickaxe.name()) ));
} else {
Dungeon.level.drop( Blacksmith.Quest.pickaxe, Dungeon.hero.pos ).sprite.drop();
}
Blacksmith.Quest.favor -= pickaxeCost;
Blacksmith.Quest.pickaxe = null;
WndBlacksmith.this.hide();
}
}
});
}
};
pickaxe.enable(Blacksmith.Quest.pickaxe != null && Blacksmith.Quest.favor >= pickaxeCost);
@@ -97,8 +110,7 @@ public class WndBlacksmith extends Window {
RedButton reforge = new RedButton(Messages.get(this, "reforge", reforgecost), 6){
@Override
protected void onClick() {
WndBlacksmith.this.hide();
GameScene.show(new WndReforge(troll, hero));
GameScene.show(new WndReforge(troll, WndBlacksmith.this));
}
};
reforge.enable(Blacksmith.Quest.favor >= reforgecost);
@@ -127,10 +139,23 @@ public class WndBlacksmith extends Window {
RedButton smith = new RedButton(Messages.get(this, "smith", 2000), 6){
@Override
protected void onClick() {
Blacksmith.Quest.favor -= 2000;
Blacksmith.Quest.smiths++;
WndBlacksmith.this.hide();
GameScene.show(new WndSmith(troll, hero));
GameScene.show(new WndOptions(
troll.sprite(),
Messages.titleCase( troll.name() ),
Messages.get(WndBlacksmith.class, "smith_verify"),
Messages.get(WndBlacksmith.class, "smith_yes"),
Messages.get(WndBlacksmith.class, "smith_no")
){
@Override
protected void onSelect(int index) {
if (index == 0){
Blacksmith.Quest.favor -= 2000;
Blacksmith.Quest.smiths++;
WndBlacksmith.this.hide();
GameScene.show(new WndSmith(troll, hero));
}
}
});
}
};
smith.enable(Blacksmith.Quest.favor >= 2000);
@@ -139,9 +164,22 @@ public class WndBlacksmith extends Window {
RedButton cashOut = new RedButton(Messages.get(this, "cashout"), 6){
@Override
protected void onClick() {
new Gold(Blacksmith.Quest.favor).doPickUp(Dungeon.hero, Dungeon.hero.pos);
Blacksmith.Quest.favor = 0;
WndBlacksmith.this.hide();
GameScene.show(new WndOptions(
troll.sprite(),
Messages.titleCase( troll.name() ),
Messages.get(WndBlacksmith.class, "cashout_verify", Blacksmith.Quest.favor),
Messages.get(WndBlacksmith.class, "cashout_yes"),
Messages.get(WndBlacksmith.class, "cashout_no")
){
@Override
protected void onSelect(int index) {
if (index == 0){
new Gold(Blacksmith.Quest.favor).doPickUp(Dungeon.hero, Dungeon.hero.pos);
Blacksmith.Quest.favor = 0;
WndBlacksmith.this.hide();
}
}
});
}
};
cashOut.enable(Blacksmith.Quest.favor > 0);
@@ -177,7 +215,7 @@ public class WndBlacksmith extends Window {
private ItemButton btnItem2;
private RedButton btnReforge;
public WndReforge( Blacksmith troll, Hero hero ) {
public WndReforge( Blacksmith troll, Window wndParent ) {
super();
IconTitle titlebar = new IconTitle();
@@ -255,6 +293,9 @@ public class WndBlacksmith extends Window {
Blacksmith.Quest.reforges++;
hide();
if (wndParent != null){
wndParent.hide();
}
}
};
btnReforge.enable( false );