diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java index 5f09d6e9b..9d3e25a0c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java @@ -116,7 +116,8 @@ public class Thief extends Mob { public int attackProc( Char enemy, int damage ) { damage = super.attackProc( enemy, damage ); - if (item == null && enemy instanceof Hero && steal( (Hero)enemy )) { + if (alignment == Alignment.ENEMY && item == null + && enemy instanceof Hero && steal( (Hero)enemy )) { state = FLEEING; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index daae6b0d4..91ff41540 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -66,7 +66,7 @@ public class CloakOfShadows extends Artifact { @Override public ArrayList actions( Hero hero ) { ArrayList actions = super.actions( hero ); - if (isEquipped( hero ) && !cursed && charge > 0) + if (isEquipped( hero ) && !cursed && (charge > 0 || stealthed)) actions.add(AC_STEALTH); return actions; } 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 8485a50e0..d4693b94a 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 @@ -61,6 +61,7 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.windows.IconTitle; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBlacksmith; +import com.shatteredpixel.shatteredpixeldungeon.windows.WndItem; import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.watabou.noosa.audio.Sample; import com.watabou.utils.Bundle; @@ -120,7 +121,8 @@ public class DriedRose extends Artifact { if (action.equals(AC_SUMMON)) { - if (ghost != null) GLog.i( Messages.get(this, "spawned") ); + if (!Ghost.Quest.completed()) GameScene.show(new WndItem(null, this, true)); + else if (ghost != null) GLog.i( Messages.get(this, "spawned") ); else if (!isEquipped( hero )) GLog.i( Messages.get(Artifact.class, "need_to_equip") ); else if (charge != chargeCap) GLog.i( Messages.get(this, "no_charge") ); else if (cursed) GLog.i( Messages.get(this, "cursed") ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 83d656efc..b98c1de1d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -131,11 +131,17 @@ public class HornOfPlenty extends Artifact { if (partialCharge >= 1){ partialCharge--; charge++; - updateQuickslot(); + if (charge == chargeCap){ GLog.p( Messages.get(HornOfPlenty.class, "full") ); partialCharge = 0; } + + if (charge >= 15) image = ItemSpriteSheet.ARTIFACT_HORN4; + else if (charge >= 10) image = ItemSpriteSheet.ARTIFACT_HORN3; + else if (charge >= 5) image = ItemSpriteSheet.ARTIFACT_HORN2; + + updateQuickslot(); } } }