From c0eecb13385c06f831bd35edea95599920ba8a91 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 19 Jul 2016 04:57:18 -0400 Subject: [PATCH] v0.4.1: updated a couple of vfx for wands/staff --- .../items/wands/WandOfTransfusion.java | 2 +- .../items/weapon/melee/MagesStaff.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java index 3d76dc982..dad69940e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java @@ -132,7 +132,7 @@ public class WandOfTransfusion extends Wand { if (lvldiffFromBase < 0){ item.upgrade(-lvldiffFromBase); CellEmitter.get(cell).start(Speck.factory(Speck.UP), 0.2f, 3); - Sample.INSTANCE.play(Assets.SND_EVOKE); + Sample.INSTANCE.play(Assets.SND_BURNING); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index a7fc3bbaf..a29b6827d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -26,10 +26,10 @@ 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.effects.particles.ElmoParticle; import com.shatteredpixel.shatteredpixeldungeon.items.Item; 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.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfCorruption; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; @@ -326,8 +326,8 @@ public class MagesStaff extends MeleeWeapon { } private void applyWand(Wand wand){ - Sample.INSTANCE.play(Assets.SND_EVOKE); - ScrollOfUpgrade.upgrade(curUser); + Sample.INSTANCE.play(Assets.SND_BURNING); + curUser.sprite.emitter().burst( ElmoParticle.FACTORY, 12 ); evoke(curUser); Dungeon.quickslot.clearItem(wand);