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

v0.3.0c: re-added particle effect when battlemage gets a staff proc.

Browse Source
This commit is contained in:
Evan Debenham 2015-06-07 02:45:25 -04:00
parent 54b068ea78
commit e69ce214dc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.*; import com.shatteredpixel.shatteredpixeldungeon.items.wands.*;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@ -102,6 +103,7 @@ public class MagesStaff extends MeleeWeapon {
public void proc(Char attacker, Char defender, int damage) { public void proc(Char attacker, Char defender, int damage) {
if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE) { if (wand != null && Dungeon.hero.subClass == HeroSubClass.BATTLEMAGE) {
wand.partialCharge += 0.5f; wand.partialCharge += 0.5f;
ScrollOfRecharging.charge((Hero)attacker);
wand.onHit(this, attacker, defender, damage); wand.onHit(this, attacker, defender, damage);
} }
super.proc(attacker, defender, damage); super.proc(attacker, defender, damage);