From 9d90a24a95eaed5a7b49b500b91d147de7d95ae7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 26 Jan 2015 01:20:39 -0500 Subject: [PATCH] v0.2.3f: corrected quickslot refresh logic across items --- .../shatteredpixeldungeon/items/DewVial.java | 11 +++++------ .../shatteredpixeldungeon/items/Item.java | 8 ++++---- .../shatteredpixeldungeon/items/KindOfWeapon.java | 5 ++--- .../items/artifacts/CapeOfThorns.java | 5 ++--- .../items/artifacts/CloakOfShadows.java | 7 +++---- .../items/artifacts/DriedRose.java | 5 +++-- .../items/artifacts/HornOfPlenty.java | 2 ++ .../items/artifacts/SandalsOfNature.java | 2 ++ .../items/artifacts/TimekeepersHourglass.java | 9 ++++----- .../items/artifacts/UnstableSpellbook.java | 3 +-- 10 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java index 153dbe6f2..5939fbe5e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; @@ -109,7 +108,7 @@ public class DewVial extends Item { Sample.INSTANCE.play( Assets.SND_DRINK ); hero.sprite.operate( hero.pos ); - QuickSlotButton.refresh(); + updateQuickslot(); } else { @@ -123,7 +122,7 @@ public class DewVial extends Item { } } - public void empty() {volume = 0; QuickSlotButton.refresh();} + public void empty() {volume = 0; updateQuickslot();} @Override public boolean isUpgradable() { @@ -148,15 +147,15 @@ public class DewVial extends Item { GLog.p( TXT_FULL ); } - QuickSlotButton.refresh(); + updateQuickslot(); } public void fill() { volume = MAX_VOLUME; - QuickSlotButton.refresh(); + updateQuickslot(); } - //removed as people need a bigger distinction to realize the dew vial doesn't revive. + //removed as people need a bigger distinction to realize the dew vial doesn't revive. /* private static final Glowing WHITE = new Glowing( 0xFFFFCC ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index e3d953ee5..b2a8030e3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -180,7 +180,7 @@ public class Item implements Bundlable { items.add( this ); Dungeon.quickslot.replaceSimilar(this); - QuickSlotButton.refresh(); + updateQuickslot(); Collections.sort( items, itemComparator ); return true; @@ -235,9 +235,9 @@ public class Item implements Bundlable { public final Item detachAll( Bag container ) { Dungeon.quickslot.clearItem( this ); - QuickSlotButton.refresh(); + updateQuickslot(); - for (Item item : container.items) { + for (Item item : container.items) { if (item == this) { container.items.remove(this); item.onDetach(); @@ -399,7 +399,7 @@ public class Item implements Bundlable { public void updateQuickslot() { if (Dungeon.quickslot.contains( this )) { - QuickSlotButton.refresh(); + updateQuickslot(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java index 05d8200c0..3ecd558dc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; @@ -60,8 +59,8 @@ public class KindOfWeapon extends EquipableItem { hero.belongings.weapon = this; activate( hero ); - - QuickSlotButton.refresh(); + + updateQuickslot(); cursedKnown = true; if (cursed) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java index 20be9bcd0..809653aed 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java @@ -4,7 +4,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Random; @@ -60,7 +59,7 @@ public class CapeOfThorns extends Artifact { BuffIndicator.refreshHero(); GLog.w("Your Cape becomes inert again."); } - QuickSlotButton.refresh(); + updateQuickslot(); } spend(TICK); return true; @@ -92,7 +91,7 @@ public class CapeOfThorns extends Artifact { } } - QuickSlotButton.refresh(); + updateQuickslot(); return damage; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index a3b343ce2..707455b07 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -8,7 +8,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.noosa.audio.Sample; import com.watabou.noosa.tweeners.AlphaTweener; @@ -185,7 +184,7 @@ public class CloakOfShadows extends Artifact { if (cooldown > 0) cooldown --; - QuickSlotButton.refresh(); + updateQuickslot(); spend( TICK ); @@ -227,7 +226,7 @@ public class CloakOfShadows extends Artifact { GLog.p("Your Cloak Grows Stronger!"); } - QuickSlotButton.refresh(); + updateQuickslot(); spend( TICK ); @@ -247,7 +246,7 @@ public class CloakOfShadows extends Artifact { cooldown = 10 - (level / 3); - QuickSlotButton.refresh(); + updateQuickslot(); super.detach(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 654cdeda8..db0536055 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -19,7 +19,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.GhostSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.watabou.noosa.audio.Sample; @@ -106,6 +105,8 @@ public class DriedRose extends Artifact { spawned = true; charge = 0; + updateQuickslot(); + } else GLog.i("There is no free space near you."); } @@ -211,7 +212,7 @@ public class DriedRose extends Artifact { } - QuickSlotButton.refresh(); + updateQuickslot(); spend( TICK ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index c59feba1d..0ba060939 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -175,6 +175,8 @@ public class HornOfPlenty extends Artifact { GLog.p("Your horn is full of food!"); partialCharge = 0; } + + updateQuickslot(); } } else partialCharge = 0; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index e57cd50de..7ecdbd079 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -74,6 +74,7 @@ public class SandalsOfNature extends Artifact { CellEmitter.bottom(hero.pos).start(EarthParticle.FACTORY, 0.05f, 8); Camera.main.shake(1, 0.4f); charge = 0; + updateQuickslot(); } } } @@ -177,6 +178,7 @@ public class SandalsOfNature extends Artifact { if (charge < target.HT){ //gain 1+(1*level)% of the difference between current charge and max HP. charge+= (Math.round( (target.HT-charge) * (.01+ level*0.01) )); + updateQuickslot(); } } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 5ce170912..ea742a8ad 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -10,7 +10,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.noosa.audio.Sample; @@ -202,7 +201,7 @@ public class TimekeepersHourglass extends Artifact { } else if (cursed && Random.Int(10) == 0) ((Hero) target).spend( TICK ); - QuickSlotButton.refresh(); + updateQuickslot(); spend( TICK ); @@ -226,7 +225,7 @@ public class TimekeepersHourglass extends Artifact { target.invisible++; - QuickSlotButton.refresh(); + updateQuickslot(); Dungeon.observe(); @@ -263,7 +262,7 @@ public class TimekeepersHourglass extends Artifact { charge --; } - QuickSlotButton.refresh(); + updateQuickslot(); if (charge <= 0){ detach(); @@ -302,7 +301,7 @@ public class TimekeepersHourglass extends Artifact { GameScene.freezeEmitters = false; charge = 0; - QuickSlotButton.refresh(); + updateQuickslot(); super.detach(); activeBuff = null; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index 60b6ef814..068dcd5f8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -13,7 +13,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMappi import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; 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.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.watabou.noosa.audio.Sample; @@ -197,7 +196,7 @@ public class UnstableSpellbook extends Artifact { } } - QuickSlotButton.refresh(); + updateQuickslot(); spend( TICK );