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

v0.3.0c: the battlemage now gains half a charge up-front on his staff when melee attacking, instead of a 2 turn charge buff

Browse Source
This commit is contained in:
Evan Debenham
2015-06-03 14:07:35 -04:00
committed by Evan Debenham
parent 94c069134d
commit 249c9acd96
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
+7 -7
View File
@@ -98,14 +98,16 @@ public class MagesStaff extends MeleeWeapon {
@Override
public void proc(Char attacker, Char defender, int damage) {
if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE)
wand.onHit( this, attacker, defender, damage );
if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE) {
wand.partialCharge += 0.5f;
wand.onHit(this, attacker, defender, damage);
}
super.proc(attacker, defender, damage);
}
@Override
public boolean collect( Bag container ) {
if (super.collect( container )) {
if (super.collect(container)) {
if (container.owner != null && wand != null) {
wand.charge(container.owner, STAFF_SCALE_FACTOR);
}
@@ -286,8 +288,6 @@ public class MagesStaff extends MeleeWeapon {
updateQuickslot();
}
}
;
}
);
}
@@ -312,7 +312,7 @@ public class MagesStaff extends MeleeWeapon {
return !((wand instanceof WandOfDisintegration)
|| (wand instanceof WandOfCorruption)
|| (wand instanceof WandOfRegrowth));
};
}
};
//determines particle effects to use based on wand the staff owns.
@@ -384,7 +384,7 @@ public class MagesStaff extends MeleeWeapon {
minSize = 1f; maxSize = 2.5f;
radiateXY(1f);
} else if (wand instanceof WandOfTransfusion) {
color( 0xCC0000 );; am = 0.6f;
color( 0xCC0000 ); am = 0.6f;
lifespan = left = 0.8f;
speed.polar( Random.Float(PointF.PI2), 2f );
minSize = 1f; maxSize = 2.5f;