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

v0.3.0c: refactor staff levelling, mages staff now gives a wand +1 max charges (magic missile reduced to 3 charges to compensate)

Browse Source
This commit is contained in:
Evan Debenham 2015-06-03 16:35:54 -04:00 committed by Evan Debenham
parent 57b3de2ae3
commit 39c736189d
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
View File

@ -72,7 +72,7 @@ public class WandOfMagicMissile extends Wand {
}
protected int initialCharges() {
return 4;
return 3;
}
@Override

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

@ -63,15 +63,7 @@ public class MagesStaff extends MeleeWeapon {
wand.identify();
wand.cursed = false;
this.wand = wand;
}
@Override
public Item upgrade(boolean enchant) {
MIN++;
MAX++;
//does not lose strength requirement
return super.upgrade( enchant );
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
}
@Override
@ -158,6 +150,7 @@ public class MagesStaff extends MeleeWeapon {
wand.degrade(Math.abs(wandLevelDiff));
this.wand = wand;
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
wand.identify();
wand.cursed = false;
wand.charge(owner);
@ -169,15 +162,33 @@ public class MagesStaff extends MeleeWeapon {
}
@Override
public Item upgrade() {
if (wand != null) wand.upgrade();
return super.upgrade();
public Item upgrade(boolean enchant) {
super.upgrade( enchant );
STR = 10;
//does not lose strength requirement
if (wand != null) {
wand.upgrade();
//gives the wand one additional charge
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
}
return this;
}
@Override
public Item degrade() {
if (wand != null) wand.degrade();
return super.degrade();
super.degrade();
STR = 10;
if (wand != null) {
wand.degrade();
//gives the wand one additional charge
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
}
return this;
}
@Override
@ -223,6 +234,7 @@ public class MagesStaff extends MeleeWeapon {
public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle);
wand = (Wand) bundle.get(WAND);
if (wand != null) wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
}
@Override