From 10143f15e02ae24a10133b1e16a5ecd0ca1b749b Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sat, 21 Jul 2018 19:20:44 -0400
Subject: [PATCH] v0.7.0: extended consumable icon functionality, some icons
 are WIP

---
 core/src/main/assets/consumable_icons.png     | Bin 2780 -> 1216 bytes
 .../actors/hero/HeroClass.java                |  42 ++++++++++++++++++
 .../exotic/PotionOfAdrenalineSurge.java       |   4 ++
 .../potions/exotic/PotionOfCleansing.java     |   4 ++
 .../potions/exotic/PotionOfCorrosiveGas.java  |   4 ++
 .../potions/exotic/PotionOfDragonsBreath.java |   4 ++
 .../potions/exotic/PotionOfEarthenArmor.java  |   4 ++
 .../potions/exotic/PotionOfHolyFuror.java     |   4 ++
 .../potions/exotic/PotionOfMagicalSight.java  |   4 ++
 .../potions/exotic/PotionOfShielding.java     |   4 ++
 .../potions/exotic/PotionOfShroudingFog.java  |   4 ++
 .../potions/exotic/PotionOfSnapFreeze.java    |   4 ++
 .../items/potions/exotic/PotionOfStamina.java |   4 ++
 .../potions/exotic/PotionOfStormClouds.java   |   4 ++
 .../scrolls/exotic/ScrollOfAffection.java     |   4 ++
 .../scrolls/exotic/ScrollOfAntiMagic.java     |   5 +++
 .../scrolls/exotic/ScrollOfConfusion.java     |   3 ++
 .../scrolls/exotic/ScrollOfDistortion.java    |   4 ++
 .../scrolls/exotic/ScrollOfEnchantment.java   |   5 +++
 .../scrolls/exotic/ScrollOfForesight.java     |   5 +++
 .../scrolls/exotic/ScrollOfPetrification.java |   5 +++
 .../shatteredpixeldungeon/ui/ItemSlot.java    |  17 ++++++-
 22 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/core/src/main/assets/consumable_icons.png b/core/src/main/assets/consumable_icons.png
index 6db333710ad876f8d6282df44a941f516bc5e225..901c5c54485741d249a4a0d5b3f3fb67290ee4c7 100644
GIT binary patch
literal 1216
zcmXX_c~H|=5PnG@l912<wm?9oL^*_k2u`LFgoGv}AkZK%f(S*Z7zD=)1rNv%5gM&X
zDz~;6Nnwf*4g>Wn#{iMmi3k!3RD~!-5f8vr8xVYb8QtBt$G6|^>_6|cC|p1#)5!n;
zYOs*E6-5j^M>7KQua+<y6z+>cqxdL}PeTZRr0zbv;saqKyZ}VVKiH)ivP2D3!h7Bz
zsuq5dl-c5b*gJ)oew{)i^H00$@t_tsz~L~o3dqqiaAtJWNSA^mgZZsbe@Dni5aBA7
zDr~bSYSleaeFQ6uc7Wqh0jFCfACOf-pYqiZe1M845W_G?r(;y=wI2n07>`3#EW`wz
zQ_v?GXjW?6_Ery_KnXH5h;B~$Y2%FELyz|IGq#3D0^<>TkU}Vd5HnVv1c7@vDG~@%
zkRnM<HF_hl%a}ljgOFn!Nl6hsN;?byAtso|jmpAlwd$)cgf#x(Iv<r+Ma}L42-_RU
z`8S=zax%5-Lsjf^;lWPDqWWQZLQ}CA<3(1R4iub&q1(PGr`Rp$NMt56J&&6$6!W&$
z%%AV3L_XC!dpL>Pw#RrrkPjX0laGXvm<HyrrBV3X^Zw3-SrgjyztdTYT)qoMDLry)
z6*a@@1EYQX`p6a%Wic-|gwuXAASl_JMD&?rJ=5Q)<@5aD!a`m94$rp9g=zh9lI`5v
z&-*3WZq`yfqoymf6q9jcJUBFt(9wgd%Vg6SGGAKI7`8t53SlrY{H!C1msfMm#LCXL
zx6tkcH$J|4P%PT;J<ouT!FSut!DPPrrb#-c?A&QX^aaOtcP$$Jh}q;|an#E7%(wgf
zs&wq`O&M=A>ns?_ikYcf2@`&o61cyS2@7Ezo?{PZ)djC64?Oh773xQ0nOV16eCS0l
zGo0SNU%p6u9?*Q}YP$N%fPZd`_`W&lb*B5#WR~ACsU_3%+R8+Si1wxBx5wIGEdC%b
z&!&^5&W`+QZ&A^!K@+OPnI<He;mt^=mSb1E`8stjaHFe~C@|E{U}8+0TXtW!sM;p$
zQ=5}@W)))LQbc^Ef^C84UJu-LXvIO2z4=b%_^hPHEs~&laH(Wr-}cM(9pfH^RP)w_
zl@f02e6=MlAl?6^=W-;SklifkRc@fI+2k<56f5?|F>$k-g(IeoTh<=V-tD%pZq`oA
z+R!o~SkbRMAft*FWAl<Y?4Upap^q{BWa435R}i59H)P-Qi~s4xGzabBcnU2i4umfI
zns<c~&%2k&TS0+PVoMY(cEI-B2x^6^l3qg2ikA1hCwIN}kXvyqIAU;$*j$!+LAD!^
z@4)$z&kRgLGo6q%iL0n;8Rk$=w3$}TtG{Rl-SuF=isC)+pH~L4M6W4#m#@=gm{jI-
z8`=!gIAv1>!{siAC7T6n`Ym-Q-L2mpxfQERh#p=w{kXyxTnrIWHiphvm#}G6zt!>|
zOv_)GZt)gz$Jo!CGDYr+oEwC-6F93tA#s29`Sqgc=+I}B(jnYv642hubhH;{I-WH|
zo3={qFZ<u2FlDbX!xZJ;(ZBG6((fE6a=}uPdBRH|?QBRYoMWZEb3vaL1oOjrje&_L
F{|97SOKJcB

literal 2780
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

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
index 0b7bf3775..e1da6ddeb 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
@@ -26,9 +26,11 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.BrokenSeal;
+import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClothArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows;
+import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.UnstableSpellbook;
 import com.shatteredpixel.shatteredpixeldungeon.items.bags.PotionBandolier;
 import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder;
 import com.shatteredpixel.shatteredpixeldungeon.items.bags.VelvetPouch;
@@ -36,6 +38,18 @@ import com.shatteredpixel.shatteredpixeldungeon.items.food.Food;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.SmallRation;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMindVision;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfAdrenalineSurge;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfCleansing;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfCorrosiveGas;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfDragonsBreath;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfEarthenArmor;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfHolyFuror;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfMagicalSight;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfShielding;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfShroudingFog;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfSnapFreeze;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfStamina;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfStormClouds;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile;
@@ -100,6 +114,17 @@ public enum HeroClass {
 		if (Dungeon.isChallenged(Challenges.NO_FOOD)){
 			new SmallRation().collect();
 		}
+		
+		new UnstableSpellbook().identify().collect();
+		
+		/*new Firebomb().collect();
+		new Flashbang().collect();
+		new FrostBomb().collect();
+		new HealingBomb().collect();
+		new HolyBomb().collect();
+		new Noisemaker().collect();
+		new ShockBomb().collect();
+		new WoollyBomb().collect();*/
 
 	}
 
@@ -130,6 +155,23 @@ public enum HeroClass {
 		new PotionBandolier().collect();
 		Dungeon.LimitedDrops.POTION_BANDOLIER.drop();
 		new PotionOfHealing().identify();
+		
+		for (int j = 0; j < 100; j++){
+			Generator.random(Generator.Category.POTION).identify().collect();
+		}
+		
+		new PotionOfAdrenalineSurge().quantity(5).identify().collect();
+		new PotionOfCleansing().quantity(5).identify().collect();
+		new PotionOfCorrosiveGas().quantity(5).identify().collect();
+		new PotionOfDragonsBreath().quantity(5).identify().collect();
+		new PotionOfEarthenArmor().quantity(5).identify().collect();
+		new PotionOfHolyFuror().quantity(5).identify().collect();
+		new PotionOfMagicalSight().quantity(5).identify().collect();
+		new PotionOfShielding().quantity(5).identify().collect();
+		new PotionOfShroudingFog().quantity(5).identify().collect();
+		new PotionOfSnapFreeze().quantity(5).identify().collect();
+		new PotionOfStamina().quantity(5).identify().collect();
+		new PotionOfStormClouds().quantity(5).identify().collect();
 	}
 
 	private static void initMage( Hero hero ) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfAdrenalineSurge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfAdrenalineSurge.java
index 646e3ba8a..654ecc988 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfAdrenalineSurge.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfAdrenalineSurge.java
@@ -27,6 +27,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfAdrenalineSurge extends ExoticPotion {
 	
+	{
+		initials = 10;
+	}
+	
 	@Override
 	public void apply(Hero hero) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
index 4c2ca941a..3328f4771 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
@@ -33,6 +33,10 @@ import com.watabou.noosa.audio.Sample;
 
 public class PotionOfCleansing extends ExoticPotion {
 	
+	{
+		initials = 9;
+	}
+	
 	@Override
 	public void apply( Hero hero ) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java
index f19082c88..6c59d8c4b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCorrosiveGas.java
@@ -30,6 +30,10 @@ import com.watabou.noosa.audio.Sample;
 
 public class PotionOfCorrosiveGas extends ExoticPotion {
 	
+	{
+		initials = 11;
+	}
+	
 	@Override
 	public void shatter( int cell ) {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java
index f03c336e5..591ccadc9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java
@@ -43,6 +43,10 @@ import java.util.HashSet;
 
 public class PotionOfDragonsBreath extends ExoticPotion {
 	
+	{
+		initials = 6;
+	}
+	
 	//a lot of this is copy-paste from wand of fireblast
 	
 	//the actual affected cells
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfEarthenArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfEarthenArmor.java
index 448f45566..25c4b7bc6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfEarthenArmor.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfEarthenArmor.java
@@ -27,6 +27,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfEarthenArmor extends ExoticPotion {
 	
+	{
+		initials = 8;
+	}
+	
 	@Override
 	public void apply( Hero hero ) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfHolyFuror.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfHolyFuror.java
index fee5c6082..efb1e77d4 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfHolyFuror.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfHolyFuror.java
@@ -27,6 +27,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfHolyFuror extends ExoticPotion {
 	
+	{
+		initials = 0;
+	}
+	
 	@Override
 	public void apply( Hero hero ) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfMagicalSight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfMagicalSight.java
index 4c7785878..67536e133 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfMagicalSight.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfMagicalSight.java
@@ -28,6 +28,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfMagicalSight extends ExoticPotion {
 	
+	{
+		initials = 7;
+	}
+	
 	@Override
 	public void apply(Hero hero) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShielding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShielding.java
index 57888e066..ca500502d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShielding.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShielding.java
@@ -27,6 +27,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfShielding extends ExoticPotion {
 	
+	{
+		initials = 3;
+	}
+	
 	@Override
 	public void apply(Hero hero) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java
index b95227dd5..f56164462 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfShroudingFog.java
@@ -30,6 +30,10 @@ import com.watabou.noosa.audio.Sample;
 
 public class PotionOfShroudingFog extends ExoticPotion {
 	
+	{
+		initials = 4;
+	}
+	
 	@Override
 	public void shatter( int cell ) {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java
index c4a3199f9..cc942ced7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfSnapFreeze.java
@@ -34,6 +34,10 @@ import com.watabou.utils.PathFinder;
 
 public class PotionOfSnapFreeze extends ExoticPotion {
 	
+	{
+		initials = 1;
+	}
+	
 	@Override
 	public void shatter(int cell) {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStamina.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStamina.java
index eb4ebdfec..6163a3d3a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStamina.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStamina.java
@@ -27,6 +27,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 
 public class PotionOfStamina extends ExoticPotion {
 	
+	{
+		initials = 2;
+	}
+	
 	@Override
 	public void apply(Hero hero) {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java
index 1a894b5fc..217bc070a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfStormClouds.java
@@ -30,6 +30,10 @@ import com.watabou.noosa.audio.Sample;
 
 public class PotionOfStormClouds extends ExoticPotion {
 	
+	{
+		initials = 5;
+	}
+	
 	@Override
 	public void shatter(int cell) {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java
index c8d169162..82b858fcd 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAffection.java
@@ -32,6 +32,10 @@ import com.watabou.noosa.audio.Sample;
 
 public class ScrollOfAffection extends ExoticScroll {
 	
+	{
+		initials = 1;
+	}
+	
 	@Override
 	public void doRead() {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAntiMagic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAntiMagic.java
index b6b5f6c0a..cb54c00d6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAntiMagic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfAntiMagic.java
@@ -26,6 +26,11 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune;
 
 public class ScrollOfAntiMagic extends ExoticScroll {
+	
+	{
+		initials = 7;
+	}
+	
 	@Override
 	public void doRead() {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java
index e31c648db..8970b0adc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfConfusion.java
@@ -33,6 +33,9 @@ import com.watabou.noosa.audio.Sample;
 
 public class ScrollOfConfusion extends ExoticScroll {
 	
+	{
+		initials = 5;
+	}
 	
 	@Override
 	public void doRead() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDistortion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDistortion.java
index ee1943104..501189bd3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDistortion.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDistortion.java
@@ -31,6 +31,10 @@ import com.watabou.noosa.Game;
 
 public class ScrollOfDistortion extends ExoticScroll {
 	
+	{
+		initials = 10;
+	}
+	
 	@Override
 	public void doRead() {
 		//FIXME this doesn't handle various edge-cases. especially as it can trigger in boss rooms!
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java
index e1bea5dea..b75e96c51 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfEnchantment.java
@@ -30,6 +30,11 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
 
 public class ScrollOfEnchantment extends ExoticScroll {
+	
+	{
+		initials = 11;
+	}
+	
 	@Override
 	public void doRead() {
 		setKnown();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java
index f64855414..215e342ab 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfForesight.java
@@ -35,6 +35,11 @@ import com.watabou.utils.Random;
 import java.util.HashSet;
 
 public class ScrollOfForesight extends ExoticScroll {
+	
+	{
+		initials = 0;
+	}
+	
 	@Override
 	public void doRead() {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java
index 102806d85..22e285a38 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPetrification.java
@@ -31,6 +31,11 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Flare;
 import com.watabou.noosa.audio.Sample;
 
 public class ScrollOfPetrification extends ExoticScroll {
+	
+	{
+		initials = 9;
+	}
+	
 	@Override
 	public void doRead() {
 		new Flare( 5, 32 ).color( 0xFF0000, true ).show( curUser.sprite, 2f );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
index 41634ac16..9e69ce07e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
@@ -28,7 +28,9 @@ 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.exotic.ExoticPotion;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
+import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ExoticScroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@@ -248,7 +250,20 @@ public class ItemSlot extends Button {
 			if (iconInt != null && iconVisible) {
 				bottomRightIcon = new Image(Assets.CONS_ICONS);
 				int left = iconInt*7;
-				int top = item instanceof Potion ? 0 : 8;
+				int top;
+				if (item instanceof Potion){
+					if (item instanceof ExoticPotion){
+						top = 8;
+					} else {
+						top = 0;
+					}
+				} else {
+					if (item instanceof ExoticScroll){
+						top = 24;
+					} else {
+						top = 16;
+					}
+				}
 				bottomRightIcon.frame(left, top, 7, 8);
 				add(bottomRightIcon);
 			}