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

v0.6.1: fixed minor visual bugs when outfitting the sad ghost

Browse Source
This commit is contained in:
Evan Debenham 2017-08-04 22:14:49 -04:00
parent c3b8eafef9
commit 5285d2e576
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -902,9 +902,8 @@ public class DriedRose extends Artifact {
@Override @Override
protected void onClick() { protected void onClick() {
if (rose.weapon != null){ if (rose.weapon != null){
if (rose.weapon.doPickUp(Dungeon.hero)){ item(new WndBag.Placeholder(ItemSpriteSheet.WEAPON_HOLDER));
item(new WndBag.Placeholder(ItemSpriteSheet.WEAPON_HOLDER)); if (!rose.weapon.doPickUp(Dungeon.hero)){
} else {
Dungeon.level.drop( rose.weapon, Dungeon.hero.pos); Dungeon.level.drop( rose.weapon, Dungeon.hero.pos);
} }
rose.weapon = null; rose.weapon = null;
@ -953,9 +952,8 @@ public class DriedRose extends Artifact {
@Override @Override
protected void onClick() { protected void onClick() {
if (rose.armor != null){ if (rose.armor != null){
if (rose.armor.doPickUp(Dungeon.hero)){ item(new WndBag.Placeholder(ItemSpriteSheet.ARMOR_HOLDER));
item(new WndBag.Placeholder(ItemSpriteSheet.ARMOR_HOLDER)); if (!rose.armor.doPickUp(Dungeon.hero)){
} else {
Dungeon.level.drop( rose.armor, Dungeon.hero.pos); Dungeon.level.drop( rose.armor, Dungeon.hero.pos);
} }
rose.armor = null; rose.armor = null;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/HeroSprite.java
View File

@ -22,6 +22,7 @@
package com.shatteredpixel.shatteredpixeldungeon.sprites; package com.shatteredpixel.shatteredpixeldungeon.sprites;
import android.graphics.RectF; import android.graphics.RectF;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@ -86,6 +87,8 @@ public class HeroSprite extends CharSprite {
read = new Animation( 20, false ); read = new Animation( 20, false );
read.frames( film, 19, 20, 20, 20, 20, 20, 20, 20, 20, 19 ); read.frames( film, 19, 20, 20, 20, 20, 20, 20, 20, 20, 19 );
idle();
} }
@Override @Override