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

v2.3.0: fixed unintended change to reforge order, and clarified it

Browse Source
This commit is contained in:
Evan Debenham
2024-01-02 20:08:42 -05:00
parent 7ef2a8629a
commit 08e36c724c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ windows.wndblacksmith.cashout=_Cash Out (all favor):_ I can just give you some r
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_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_yes=Give me the gold.
windows.wndblacksmith.cashout_no=Nevermind. 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.message=Okay, I can reforge two identified items of the same type. The weaker one will be destroyed to give the stronger one an upgrade. If they're the same level, I'll keep the one on the left.
windows.wndblacksmith$wndreforge.prompt=Reforge an item windows.wndblacksmith$wndreforge.prompt=Reforge an item
windows.wndblacksmith$wndreforge.reforge=Reforge them windows.wndblacksmith$wndreforge.reforge=Reforge them
windows.wndblacksmith$hardenselector.prompt=Harden an item windows.wndblacksmith$hardenselector.prompt=Harden an item

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

@@ -257,7 +257,7 @@ public class WndBlacksmith extends Window {
protected void onClick() { protected void onClick() {
Item first, second; Item first, second;
if (btnItem1.item().trueLevel() > btnItem2.item().trueLevel()) { if (btnItem1.item().trueLevel() >= btnItem2.item().trueLevel()) {
first = btnItem1.item(); first = btnItem1.item();
second = btnItem2.item(); second = btnItem2.item();
} else { } else {