LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.3a: adjusted how mage's staff handles its name

Browse Source
This commit is contained in:
Evan Debenham 2015-12-24 23:22:22 -05:00
parent e1471c3678
commit f36870aa9b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
View File

@ -57,7 +57,7 @@ public class MagesStaff extends MeleeWeapon {
private static final float STAFF_SCALE_FACTOR = 0.75f; private static final float STAFF_SCALE_FACTOR = 0.75f;
{ {
name = "staff"; name = "mage's staff";
image = ItemSpriteSheet.MAGES_STAFF; image = ItemSpriteSheet.MAGES_STAFF;
defaultAction = AC_ZAP; defaultAction = AC_ZAP;
@ -86,6 +86,7 @@ public class MagesStaff extends MeleeWeapon {
this.wand = wand; this.wand = wand;
wand.maxCharges = Math.min(wand.maxCharges + 1, 10); wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
wand.curCharges = wand.maxCharges; wand.curCharges = wand.maxCharges;
name = wand.name().replace("Wand", "Staff");
} }
@Override @Override
@ -179,6 +180,8 @@ public class MagesStaff extends MeleeWeapon {
wand.cursed = false; wand.cursed = false;
wand.charge(owner); wand.charge(owner);
name = wand.name().replace("Wand", "Staff");
updateQuickslot(); updateQuickslot();
return this; return this;
@ -227,16 +230,6 @@ public class MagesStaff extends MeleeWeapon {
else return wand.status(); else return wand.status();
} }
@Override
public String name(){
if (wand == null)
return "mage's staff";
else {
String name = wand.name().replace("Wand", "Staff");
return enchantment == null ? name : enchantment.name( name );
}
}
@Override @Override
public String info() { public String info() {
return super.info(); return super.info();
@ -264,7 +257,10 @@ public class MagesStaff extends MeleeWeapon {
public void restoreFromBundle(Bundle bundle) { public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
wand = (Wand) bundle.get(WAND); wand = (Wand) bundle.get(WAND);
if (wand != null) wand.maxCharges = Math.min(wand.maxCharges + 1, 10); if (wand != null) {
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
name = wand.name().replace("Wand", "Staff");
}
} }
@Override @Override