From 212e320f45b185e69869c493ac9fddfac84e8cf7 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 4 Jun 2018 19:04:29 -0400
Subject: [PATCH] v0.7.0: implement icons for new potion/scroll

---
 core/src/main/assets/consumable_icons.png       | Bin 690 -> 739 bytes
 .../items/potions/PotionOfHaste.java            |   3 +--
 .../items/potions/PotionOfHealing.java          |   2 +-
 .../items/potions/PotionOfInvisibility.java     |   2 +-
 .../items/potions/PotionOfLevitation.java       |   2 +-
 .../items/potions/PotionOfLiquidFlame.java      |   2 +-
 .../items/potions/PotionOfMight.java            |   2 +-
 .../items/scrolls/ScrollOfMagicMapping.java     |   2 +-
 .../items/scrolls/ScrollOfMagicalInfusion.java  |   2 +-
 .../items/scrolls/ScrollOfMirrorImage.java      |   2 +-
 .../items/scrolls/ScrollOfPsionicBlast.java     |   2 +-
 .../items/scrolls/ScrollOfRage.java             |   2 +-
 .../items/scrolls/ScrollOfRecharging.java       |   2 +-
 .../items/scrolls/ScrollOfRemoveCurse.java      |   2 +-
 .../items/scrolls/ScrollOfTeleportation.java    |   2 +-
 .../items/scrolls/ScrollOfTerror.java           |   2 +-
 .../items/scrolls/ScrollOfTransmutation.java    |   2 +-
 17 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/src/main/assets/consumable_icons.png b/core/src/main/assets/consumable_icons.png
index 9cb86cda7f1c6e53d816cefe101053778f10c90d..9ee74ba85f6bae748c87903c2d25bfc6865baf88 100644
GIT binary patch
delta 674
zcmV;T0$u&G1>*&fBrl3kOjJbx007?T|Nj60f2q>{sx$xpVE>u`Q2${6+hxqt5&!=H
z-su1TngIXLGLcOiUjNA%rT`qcT>$^pO#q<(qyOmt|Npdq{<MGong27F9{&LT|D)pn
zfPjGi8XABN4QeCdw~<Ex0001c|4Oqq0DJ!czvZ7XNW1_504;P<PE!DC|NsAL|7!pL
z|NnoH!4-f1!2kdM|NsC0{{aD+<pcl#0ozGLK~#7F)YDgXD>o2D(aoH5P-YOD%9{W5
zTr?II?3Y`A?-cmUd-|fF&`{89HlfvODQGJ|N1+SQgT6mzU}&Jhh=%caJShUL>2%tH
z*?f)#Sguy9CF^wuHW$$CcCp>|K)+wdU^u|25d(jdE0bnI7MMpqEZQR9(rVf1bi#m5
zKZfoFy<RU2M1Bo};cz}2(in|K4aSr4WFqBX)5`gCv=@soSV^a|Uaxhe2D-t`&5ho6
zyVdIl7oV>+V8Zov#9v?M1|okZ3EbueL<4cK0U>~BAPyn$<sFC$5CViijI;r{fxH7E
zevN-9pa_Wgts+p12AD8Gd_S~e3hj2A%o+-D1K0xM2K+tT1pxO6zvLkX?Dpk_WDdZw
zjsS7+_~<@{`_t(pepFQj=kpW8e_>{BX1|O09rG%NXGhOC91d_i)-jL;xW9Bz1m+ju
z>CEuuMOZwT&1W8V>|)GcWAJ=T`GLr<W$=IY_ErSo-U+At?@<8fERe0Df^r2B`5KXj
z;Qjsm7(72e|GB_Nx`0paQwODiDm8HSZ3A}u9jO9x13~~oKwUmRKgl~FO~lVD&QHGG
z0d{E(RIin?178w&<7cm+QvKu=L_DCP5H|qF=YOWoFhl?VrqnI`sIr||00000Nks-u
IM6N<$g21#(!T<mO

delta 666
zcmaFNx`}myN_}I1Plzi61H-)+|Nk>E)UUksf0gn7+o}KmC;Xqq5b!_Y%w<8K1W=YC
zWZ8cxNP9o|-2Wp_fog2_djQoeW02Vq%kclIFT;ZW)8+mz{tq<k|CaiHKs58eF~h(A
ziy!@OXlVE^CDp*oyM3ZN&^m_d|5?fpy*AgI0a*<DpU(UXq!<{qN`m}?8L~k3WC0-%
zG=K;=Z~zG&fN>cGGga9c7#O#Cx;TbZFkZbJUL<WO;Ck`!oZ=0VM;C7Tw%@^gmAC1+
z#($S`KTLmrF5AJE*<`kF#@47STN?ZFU#@!TS^wp)G_x}^ubW9w!?g;Vyn`uLM}3}^
zTg}iH>$W_dDjvrArOI~A_1gbu5-bj^5L`UdgK?Rv{AM$&))VI2XO!>0o0M?1b7A;}
z_uv2DO|Y25*KXprIMDf7enx6t!?zqUHdVVIu_=pp$LN)&GOO0@zWZwZ_3Xd5r8nGk
z`I9!8SA(fuSn~s?;)A`67ae5QIB+OPb$p&*p5V-J<O#2Wv`6DFK9OeCrA<)_B-Y&Z
zV4m{cU3=NGyLrwz4oyq*J9rb`Du1#J*nHUTV>F-PgNjx6yFc?XJw0$&wrscTZ;5Zy
zPrLqHxr%Gu_3E}(Md4uK<;h3nXNDPC%s+qUNy8cbH{R@957cjA_#WQI&wun$g3(+H
z8A~muenZv&V$I8!FBduS=lS#Jwl{V^Q2M`D<iOWhhp4GsuSBQ(m_B`ay;#Lr);*3K
z8_x5+Vq2B-;MH$78GrXpOdO2npT2!t%kaB<PRIPPnD>7R*kwLTt&m$in|0obPToI1
oxU{b7$2lJH))J8Zu<-{|jPMz?Gv3d$-hh&Xr>mdKI;Vst06uwFc>n+a

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java
index 7d9d2df20..513546a50 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java
@@ -30,8 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 public class PotionOfHaste extends Potion {
 	
 	{
-		//TODO
-		initials = -1;
+		initials = 2;
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java
index e5ad1ed2f..f06939a9d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java
@@ -35,7 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 public class PotionOfHealing extends Potion {
 
 	{
-		initials = 2;
+		initials = 3;
 
 		bones = true;
 	}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
index 204725d80..568fca7e0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
@@ -32,7 +32,7 @@ import com.watabou.noosa.audio.Sample;
 public class PotionOfInvisibility extends Potion {
 
 	{
-		initials = 3;
+		initials = 4;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java
index 06fa248e8..52a6e42d0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java
@@ -36,7 +36,7 @@ import com.watabou.noosa.audio.Sample;
 public class PotionOfLevitation extends Potion {
 
 	{
-		initials = 4;
+		initials = 5;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java
index e9e160915..4c5f55ef6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java
@@ -32,7 +32,7 @@ import com.watabou.utils.PathFinder;
 public class PotionOfLiquidFlame extends Potion {
 
 	{
-		initials = 5;
+		initials = 6;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java
index 357c22af9..f3f470f38 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java
@@ -33,7 +33,7 @@ public class PotionOfMight extends Potion {
 	//TODO finish transitioning this item
 
 	{
-		initials = 6;
+		initials = 12;
 		image = ItemSpriteSheet.POTION_AMBER;
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java
index 685edfe17..d2d2764dd 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java
@@ -39,7 +39,7 @@ import com.watabou.noosa.audio.Sample;
 public class ScrollOfMagicMapping extends Scroll {
 
 	{
-		initials = 3;
+		initials = 2;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java
index c36098e0c..7f34fcef5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java
@@ -37,7 +37,7 @@ public class ScrollOfMagicalInfusion extends InventoryScroll {
 	//TODO decide what to do with this one
 	
 	{
-		initials = 2;
+		initials = 12;
 		mode = WndBag.Mode.ENCHANTABLE;
 		image = ItemSpriteSheet.SCROLL_ISAZ;
 	}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java
index 593c3527f..8f42f9763 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
 public class ScrollOfMirrorImage extends Scroll {
 
 	{
-		initials = 4;
+		initials = 3;
 	}
 
 	private static final int NIMAGES	= 3;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
index e80fe9b79..2b61f4916 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java
@@ -37,7 +37,7 @@ import com.watabou.utils.Random;
 public class ScrollOfPsionicBlast extends Scroll {
 
 	{
-		initials = 5;
+		initials = 4;
 
 		bones = true;
 	}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java
index fd7c3e923..2682144be 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java
@@ -37,7 +37,7 @@ import com.watabou.noosa.audio.Sample;
 public class ScrollOfRage extends Scroll {
 
 	{
-		initials = 6;
+		initials = 5;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java
index f32fd1b2c..2eaea6db8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java
@@ -37,7 +37,7 @@ public class ScrollOfRecharging extends Scroll {
 	public static final float BUFF_DURATION = 30f;
 
 	{
-		initials = 7;
+		initials = 6;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
index 3b74637f3..61e86a64b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
@@ -39,7 +39,7 @@ import com.watabou.noosa.audio.Sample;
 public class ScrollOfRemoveCurse extends InventoryScroll {
 
 	{
-		initials = 8;
+		initials = 7;
 		mode = WndBag.Mode.UNIDED_OR_CURSED;
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
index f0c3ce66a..17a0f2024 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
@@ -41,7 +41,7 @@ import com.watabou.utils.PathFinder;
 public class ScrollOfTeleportation extends Scroll {
 
 	{
-		initials = 9;
+		initials = 7;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java
index 98b90793a..9f19da621 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java
@@ -36,7 +36,7 @@ import com.watabou.noosa.audio.Sample;
 public class ScrollOfTerror extends Scroll {
 
 	{
-		initials = 10;
+		initials = 9;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java
index 7a5816bc4..6a2ed268a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java
@@ -47,7 +47,7 @@ public class ScrollOfTransmutation extends InventoryScroll {
 	
 	{
 		//TODO
-		initials = -1;
+		initials = 10;
 		mode = WndBag.Mode.TRANMSUTABLE;
 	}