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

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
@@ -20,6 +20,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import java.util.ArrayList;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -125,6 +126,8 @@ public abstract class Wand extends KindOfWeapon {
protected abstract void onZap( Ballistica attack );
public abstract void onHit( MagesStaff staff, Char attacker, Char defender, int damage);
@Override
public boolean collect( Bag container ) {
if (super.collect( container )) {