From f0c00d8961989a0886112cdae033408a3bb82518 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 15 Sep 2014 20:22:54 -0400 Subject: [PATCH] V0.2.0: cleaned up Chalice of Blood visuals --- .../items/artifacts/ChaliceOfBlood.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index 270e16e3e..84a2ff3c2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -76,7 +76,7 @@ public class ChaliceOfBlood extends Artifact { private void prick(Hero hero){ int damage = (level*2)*(level*2); - hero.spendAndNext(3f); + Earthroot.Armor armor = hero.buff(Earthroot.Armor.class); if (armor != null) { @@ -85,7 +85,9 @@ public class ChaliceOfBlood extends Artifact { damage -= Random.IntRange(0, hero.dr()); - //TODO: make sure this looks good + hero.sprite.operate( hero.pos ); + hero.busy(); + hero.spend(3f); if (damage <= 0){ GLog.i("You prick yourself, and your blood drips into the chalice."); } else if (damage < 25){ @@ -95,11 +97,11 @@ public class ChaliceOfBlood extends Artifact { } else if (damage < 100){ GLog.w("Your life essence drains into the chalice."); Sample.INSTANCE.play(Assets.SND_CURSED); - hero.sprite.emitter().burst( ShadowParticle.CURSE, 9 ); + hero.sprite.emitter().burst( ShadowParticle.CURSE, 12 ); } else { GLog.w("The chalice devours your life energy."); Sample.INSTANCE.play(Assets.SND_CURSED); - hero.sprite.emitter().burst( ShadowParticle.CURSE, 12 ); + hero.sprite.emitter().burst( ShadowParticle.CURSE, 24 ); } if (damage > 0)