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

v0.3.0: structure for battlemage rework (some implementation, no balancing atm)

Browse Source
This commit is contained in:
Evan Debenham
2015-03-31 00:31:47 -04:00
parent 75f1181d27
commit 2d134123de
16 changed files with 127 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
+8
View File
@@ -4,6 +4,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
@@ -91,6 +92,13 @@ public class MagesStaff extends MeleeWeapon {
super.execute(hero, action);
}
@Override
public void proc(Char attacker, Char defender, int damage) {
super.proc(attacker, defender, damage);
if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE)
wand.onHit( this, attacker, defender, damage );
}
@Override
public boolean collect( Bag container ) {
if (super.collect( container )) {