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

v0.3.4: updated how the mage's staff names itself

Browse Source
This commit is contained in:
Evan Debenham
2016-01-27 00:31:28 -05:00
committed by Evan Debenham
parent d9d6e45d04
commit 9115ea7652
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
+8 -8
View File
@@ -84,7 +84,7 @@ public class MagesStaff extends MeleeWeapon {
this.wand = wand;
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
wand.curCharges = wand.maxCharges;
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
}
@Override
@@ -178,7 +178,7 @@ public class MagesStaff extends MeleeWeapon {
wand.cursed = false;
wand.charge(owner);
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
updateQuickslot();
@@ -256,7 +256,7 @@ public class MagesStaff extends MeleeWeapon {
wand = (Wand) bundle.get(WAND);
if (wand != null) {
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
}
}
@@ -266,18 +266,18 @@ public class MagesStaff extends MeleeWeapon {
if (item != null) {
if (!item.isIdentified()) {
GLog.w(Messages.get(this, "id_first"));
GLog.w(Messages.get(MagesStaff.class, "id_first"));
return;
} else if (item.cursed){
GLog.w(Messages.get(this, "cursed"));
GLog.w(Messages.get(MagesStaff.class, "cursed"));
return;
}
GameScene.show(
new WndOptions("",
Messages.get(this, "warning"),
Messages.get(this, "yes"),
Messages.get(this, "no")) {
Messages.get(MagesStaff.class, "warning"),
Messages.get(MagesStaff.class, "yes"),
Messages.get(MagesStaff.class, "no")) {
@Override
protected void onSelect(int index) {
if (index == 0) {