diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java index 87921eea1..478e5232e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java @@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Callback; import com.watabou.utils.Random; @@ -71,10 +72,19 @@ public class EtherealChains extends Artifact { curUser = hero; - if (!isEquipped( hero )) GLog.i( Messages.get(Artifact.class, "need_to_equip") ); - else if (charge < 1) GLog.i( Messages.get(this, "no_charge") ); - else if (cursed) GLog.w( Messages.get(this, "cursed") ); - else { + if (!isEquipped( hero )) { + GLog.i( Messages.get(Artifact.class, "need_to_equip") ); + QuickSlotButton.cancel(); + + } else if (charge < 1) { + GLog.i( Messages.get(this, "no_charge") ); + QuickSlotButton.cancel(); + + } else if (cursed) { + GLog.w( Messages.get(this, "cursed") ); + QuickSlotButton.cancel(); + + } else { GameScene.selectCell(caster); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index c69f8a0b0..0af1f1b2a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -19,7 +19,6 @@ * along with this program. If not, see */ package com.shatteredpixel.shatteredpixeldungeon.items.artifacts; -//If it weren't super obvious, this is going to become an artifact soon. import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -41,6 +40,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; @@ -126,9 +126,15 @@ public class LloydsBeacon extends Artifact { curUser = hero; int chargesToUse = Dungeon.depth > 20 ? 2 : 1; - if (!isEquipped( hero )) GLog.i( Messages.get(Artifact.class, "need_to_equip") ); - else if (charge < chargesToUse) GLog.i( Messages.get(this, "no_charge") ); - else { + if (!isEquipped( hero )) { + GLog.i( Messages.get(Artifact.class, "need_to_equip") ); + QuickSlotButton.cancel(); + + } else if (charge < chargesToUse) { + GLog.i( Messages.get(this, "no_charge") ); + QuickSlotButton.cancel(); + + } else { GameScene.selectCell(zapper); }