From 394d7a0a73990f3c785299c31ca895840e82c258 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 21 Mar 2015 15:37:33 -0400 Subject: [PATCH] v0.2.4d: added name initials for identified potions and scrolls --- .../items/potions/Potion.java | 6 ++++++ .../items/potions/PotionOfExperience.java | 1 + .../items/potions/PotionOfFrost.java | 1 + .../items/potions/PotionOfHealing.java | 1 + .../items/potions/PotionOfInvisibility.java | 1 + .../items/potions/PotionOfLevitation.java | 1 + .../items/potions/PotionOfLiquidFlame.java | 1 + .../items/potions/PotionOfMight.java | 1 + .../items/potions/PotionOfMindVision.java | 1 + .../items/potions/PotionOfParalyticGas.java | 1 + .../items/potions/PotionOfPurity.java | 1 + .../items/potions/PotionOfStrength.java | 1 + .../items/potions/PotionOfToxicGas.java | 2 +- .../items/scrolls/Scroll.java | 8 +++++++- .../items/scrolls/ScrollOfIdentify.java | 2 ++ .../items/scrolls/ScrollOfLullaby.java | 2 +- .../items/scrolls/ScrollOfMagicMapping.java | 1 + .../scrolls/ScrollOfMagicalInfusion.java | 2 ++ .../items/scrolls/ScrollOfMirrorImage.java | 1 + .../items/scrolls/ScrollOfPsionicBlast.java | 1 + .../items/scrolls/ScrollOfRage.java | 1 + .../items/scrolls/ScrollOfRecharging.java | 1 + .../items/scrolls/ScrollOfRemoveCurse.java | 1 + .../items/scrolls/ScrollOfTeleportation.java | 1 + .../items/scrolls/ScrollOfTerror.java | 1 + .../items/scrolls/ScrollOfUpgrade.java | 2 ++ .../shatteredpixeldungeon/ui/ItemSlot.java | 19 +++++++++++++++++++ 27 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 75b6a6119..73a64b077 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -56,6 +56,8 @@ public class Potion extends Item { "Are you sure you want to throw it? In most cases it makes sense to drink it."; private static final float TIME_TO_DRINK = 1f; + + protected String initials; private static final Class[] potions = { PotionOfHealing.class, @@ -269,6 +271,10 @@ public class Potion extends Item { "This flask contains a swirling " + color + " liquid. " + "Who knows what it will do when drunk or thrown?"; } + + public String initials(){ + return isKnown() ? initials : null; + } @Override public boolean isIdentified() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java index d7985b16b..babc4de04 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java @@ -23,6 +23,7 @@ public class PotionOfExperience extends Potion { { name = "Potion of Experience"; + initials = "Ex"; bones = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index aeaf9f61a..63292ff0d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -32,6 +32,7 @@ public class PotionOfFrost extends Potion { { name = "Potion of Frost"; + initials = "Fr"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java index f77e26891..6643d8d32 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java @@ -31,6 +31,7 @@ public class PotionOfHealing extends Potion { { name = "Potion of Healing"; + initials = "He"; bones = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java index 3fe8e4fa5..42c29bf1e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java @@ -32,6 +32,7 @@ public class PotionOfInvisibility extends Potion { { name = "Potion of Invisibility"; + initials = "In"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index 0012ec63e..b36ff2133 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -32,6 +32,7 @@ public class PotionOfLevitation extends Potion { { name = "Potion of Levitation"; + initials = "Le"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index 939c65490..246a8c1b7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -32,6 +32,7 @@ public class PotionOfLiquidFlame extends Potion { { name = "Potion of Liquid Flame"; + initials = "LF"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java index af64a9fc9..8b25a3079 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java @@ -26,6 +26,7 @@ public class PotionOfMight extends PotionOfStrength { { name = "Potion of Might"; + initials = "Mi"; bones = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java index f88e2e4d6..64ebe280c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java @@ -27,6 +27,7 @@ public class PotionOfMindVision extends Potion { { name = "Potion of Mind Vision"; + initials = "MV"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java index 5f07d8e96..fdde68fac 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java @@ -28,6 +28,7 @@ public class PotionOfParalyticGas extends Potion { { name = "Potion of Paralytic Gas"; + initials = "PG"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index 77e17befd..f2b9a78d8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -44,6 +44,7 @@ public class PotionOfPurity extends Potion { { name = "Potion of Purification"; + initials = "Pu"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java index e2f9c3e92..75f96d01a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java @@ -26,6 +26,7 @@ public class PotionOfStrength extends Potion { { name = "Potion of Strength"; + initials = "St"; bones = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index 44a6c13c0..5e9e5359b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -20,7 +20,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.potions; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; @@ -29,6 +28,7 @@ public class PotionOfToxicGas extends Potion { { name = "Potion of Toxic Gas"; + initials = "TG"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index 4121b9aab..b9274c426 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -40,7 +40,9 @@ public abstract class Scroll extends Item { public static final String AC_READ = "READ"; protected static final float TIME_TO_READ = 1f; - + + protected String initials; + private static final Class[] scrolls = { ScrollOfIdentify.class, ScrollOfMagicMapping.class, @@ -169,6 +171,10 @@ public abstract class Scroll extends Item { "This parchment is covered with indecipherable writing, and bears a title " + "of rune " + rune + ". Who knows what it will do when read aloud?"; } + + public String initials(){ + return isKnown() ? initials : null; + } @Override public boolean isUpgradable() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java index 0e4f27ad8..9b01d7bf4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java @@ -27,6 +27,8 @@ public class ScrollOfIdentify extends InventoryScroll { { name = "Scroll of Identify"; + initials = "Id"; + inventoryTitle = "Select an item to identify"; mode = WndBag.Mode.UNIDENTIFED; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index b58b5fed5..a4847c7b1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -23,7 +23,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; @@ -33,6 +32,7 @@ public class ScrollOfLullaby extends Scroll { { name = "Scroll of Lullaby"; + initials = "Lu"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index 13518d737..f77745628 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -35,6 +35,7 @@ public class ScrollOfMagicMapping extends Scroll { { name = "Scroll of Magic Mapping"; + initials = "MM"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java index e48ffe7e8..47b8c40a4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java @@ -32,6 +32,8 @@ public class ScrollOfMagicalInfusion extends InventoryScroll { { name = "Scroll of Magical Infusion"; + initials = "MaI"; + inventoryTitle = "Select an item to infuse"; mode = WndBag.Mode.ENCHANTABLE; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index ee42eac04..119bbf9a0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -35,6 +35,7 @@ public class ScrollOfMirrorImage extends Scroll { { name = "Scroll of Mirror Image"; + initials = "MI"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java index 769c81b5e..4098ce3d8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java @@ -36,6 +36,7 @@ public class ScrollOfPsionicBlast extends Scroll { { name = "Scroll of Psionic Blast"; + initials = "PB"; bones = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index 4493f8def..d90bedc58 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -34,6 +34,7 @@ public class ScrollOfRage extends Scroll { { name = "Scroll of Rage"; + initials = "Ra"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index 4b99c1911..77afedb4d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java @@ -29,6 +29,7 @@ public class ScrollOfRecharging extends Scroll { { name = "Scroll of Recharging"; + initials = "Re"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index 905374f05..6a6eb4982 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -36,6 +36,7 @@ public class ScrollOfRemoveCurse extends Scroll { { name = "Scroll of Remove Curse"; + initials = "RC"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 509667360..270bc7c48 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -35,6 +35,7 @@ public class ScrollOfTeleportation extends Scroll { { name = "Scroll of Teleportation"; + initials = "TP"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index c12a3a9bc..b3dae6316 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -32,6 +32,7 @@ public class ScrollOfTerror extends Scroll { { name = "Scroll of Terror"; + initials = "Te"; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java index 04e7a6695..81039c1d5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java @@ -31,6 +31,8 @@ public class ScrollOfUpgrade extends InventoryScroll { { name = "Scroll of Upgrade"; + initials = "Up"; + inventoryTitle = "Select an item to upgrade"; mode = WndBag.Mode.UPGRADEABLE; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index be78ce838..d90232a7b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -22,6 +22,12 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; import com.shatteredpixel.shatteredpixeldungeon.items.keys.Key; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMight; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; @@ -35,6 +41,7 @@ public class ItemSlot extends Button { public static final int DEGRADED = 0xFF4444; public static final int UPGRADED = 0x44FF44; + public static final int FADED = 0x999999; public static final int WARNING = 0xFF8800; private static final float ENABLED = 1.0f; @@ -176,6 +183,18 @@ public class ItemSlot extends Button { bottomRight.text( item.levelKnown ? Utils.format( TXT_LEVEL, level ) : TXT_CURSED ); bottomRight.measure(); bottomRight.hardlight( level > 0 ? UPGRADED : DEGRADED ); + } else if (item instanceof Scroll || item instanceof Potion) { + if (item instanceof Scroll) bottomRight.text(((Scroll) item).initials()); + else bottomRight.text(((Potion) item).initials()); + + bottomRight.measure(); + + if (item instanceof ScrollOfUpgrade || item instanceof ScrollOfMagicalInfusion + || item instanceof PotionOfStrength || item instanceof PotionOfMight) + bottomRight.hardlight( UPGRADED ); + else + bottomRight.hardlight( FADED ); + } else { bottomRight.text( null ); }