From 5285d2e57654ddf6b504ecbdfbe75599ab4036ac Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 4 Aug 2017 22:14:49 -0400 Subject: [PATCH] v0.6.1: fixed minor visual bugs when outfitting the sad ghost --- .../items/artifacts/DriedRose.java | 10 ++++------ .../shatteredpixeldungeon/sprites/HeroSprite.java | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 8fd90e01f..afaeb3919 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -902,9 +902,8 @@ public class DriedRose extends Artifact { @Override protected void onClick() { if (rose.weapon != null){ - if (rose.weapon.doPickUp(Dungeon.hero)){ - item(new WndBag.Placeholder(ItemSpriteSheet.WEAPON_HOLDER)); - } else { + item(new WndBag.Placeholder(ItemSpriteSheet.WEAPON_HOLDER)); + if (!rose.weapon.doPickUp(Dungeon.hero)){ Dungeon.level.drop( rose.weapon, Dungeon.hero.pos); } rose.weapon = null; @@ -953,9 +952,8 @@ public class DriedRose extends Artifact { @Override protected void onClick() { if (rose.armor != null){ - if (rose.armor.doPickUp(Dungeon.hero)){ - item(new WndBag.Placeholder(ItemSpriteSheet.ARMOR_HOLDER)); - } else { + item(new WndBag.Placeholder(ItemSpriteSheet.ARMOR_HOLDER)); + if (!rose.armor.doPickUp(Dungeon.hero)){ Dungeon.level.drop( rose.armor, Dungeon.hero.pos); } rose.armor = null; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java index 50cfb8925..ceaf8f49e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.sprites; import android.graphics.RectF; + import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; @@ -86,6 +87,8 @@ public class HeroSprite extends CharSprite { read = new Animation( 20, false ); read.frames( film, 19, 20, 20, 20, 20, 20, 20, 20, 20, 19 ); + + idle(); } @Override