From 08e36c724c8c0dc9373793e5509941b474ce34c3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 2 Jan 2024 20:08:42 -0500 Subject: [PATCH] v2.3.0: fixed unintended change to reforge order, and clarified it --- core/src/main/assets/messages/windows/windows.properties | 2 +- .../shatteredpixeldungeon/windows/WndBlacksmith.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/assets/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties index ae5ed60f9..a1fad6ed0 100644 --- a/core/src/main/assets/messages/windows/windows.properties +++ b/core/src/main/assets/messages/windows/windows.properties @@ -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_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.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.reforge=Reforge them windows.wndblacksmith$hardenselector.prompt=Harden an item diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java index e08608c9c..fc93523f1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java @@ -257,7 +257,7 @@ public class WndBlacksmith extends Window { protected void onClick() { Item first, second; - if (btnItem1.item().trueLevel() > btnItem2.item().trueLevel()) { + if (btnItem1.item().trueLevel() >= btnItem2.item().trueLevel()) { first = btnItem1.item(); second = btnItem2.item(); } else {