From b81afadf809829fe6423edf0a5b51ad09bdedffc Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 13 May 2020 14:35:56 -0400
Subject: [PATCH] v0.8.1: improved several item icons and added rough ring
 icons.

---
 core/src/main/assets/sprites/item_icons.png   | Bin 1301 -> 1602 bytes
 .../items/scrolls/exotic/ScrollOfPassage.java |   2 +-
 .../sprites/ItemSpriteSheet.java              |  53 ++++++++++--------
 .../windows/WndJournal.java                   |   2 +-
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/core/src/main/assets/sprites/item_icons.png b/core/src/main/assets/sprites/item_icons.png
index bbeee1ea3b1f6c0a529111de9a968e633202c4fe..dcf6bb092f3cb4f23688cb8f959091bac43b8e50 100644
GIT binary patch
literal 1602
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

literal 1301
zcmX|AeN@s{7`}YThhSLt1!`GYYHWTnvqTSh@T)?}v}xI-ESj7xNj;^@1WJ#6El``8
zS)rI#t8~$h*qY$98fjUvP0@~uNZL|Kn~ItIcCB-I?t7o-eV=pR_uTu(J;{rXppa-J
z001Q_k`oJ60ymq0fovwoxKIXoTjIi?UO@bT0)bHWLjrfjHW<K$D3KwAMw3t|b1ndo
z>kA_!5{Yo7ag!<l96^A_4Eek(0@|D^^*M-te4^iSq<bF><>h>6!q`*JgwxtQzpr@F
z-lkKl>MC-x1xOiy6D`G0krs2$5Q5zB=OO$#v)xa8{RM*XS(?Z;y(5AM=6u~!5LXRN
z^)65ioRPn|DwS%k>jXITJpb;i`|xh3Iy<?+Uqa`4zv@#7oeQ$0PkGoDFBZ(UWX48s
zgU?`V5kv@I10ne&D1;3Y!N(f%X9&fgPk!`-0x=?-YZbtinri!MAOir*xhT%YxGdDL
zzN19xL(Mbx8tew#)(={3GWD*1cDER!?!DBmDeLyC$5rcJXKuI@T~qLyo+ou#;!r>f
z_a>N#f(;MaSdm3eZaCc?vZ-ABU|{M8FGa+wy#W>4ZhFFTU1$HJYrs#1DPyKC{xdzu
zqdRraIL>5GF5RDT#Gj*g;!RrX(f;%zY|$aqe!M6@BjDilzQoY@_{i1E)+rXAS@Rwv
z%t0XzV;hX#TB7ewP`%?>kM`LW5&q$VFQoSlkgP7N9{<G5PDXJt{q|W#haBc)hr)4G
z;?dh1o_>Di?YaeDEB>QP-Y(49J9hU8E9CJ-+|YCoqp)#Vf}yE5RF#Vwc35%oN7qi$
zDm&dfXT!+UjEhLF{$P$Z*tCVkTn|ym&p1=7*)M!L{nroOBLYfUt<QqCo_1rd_@$+w
zG>5o0;ULRpB=}q!DWOqiS6VeY+ii)+sI$(PsOOWNaB<f4#N<WVK~0*3$(^+upR~*B
zLc7Y=INk(IT*!gGd>$|t1hMb286mAZ5BE*WhtM0<m_s{4QRk4Y2Wmz<TM`y&x@yy0
zI&OK8ny(!9+E%|cXkwLnY?G3)sk-*Xj7FBtPNDO{)aiX1gJs$2H&m9`om$hExIDVa
zKX=Shqf{zQlq|8hK-S*gK5q#+{FraCZZBz^g>T%ql-<OTHeAkbolQ$~lTXg@=w#nK
z9KXRCqfh4QG>whpR{Mv-c<u02*V3u3(U`YAecRsoU>V^)uCijOF4ON436)533M(Y9
zkbdL+W}<5}xwgaYZMpW_U#xn5LlUjoX~0ptj(2nWTAV;}6fH!37clYu$-@kMk#<om
z+H^JQlq7OFO+Mdadllf|yX-kc=^&PN+`XEKo&bOF%@&>pRYeY9dGeVwsXKKbov_{Z
z`+cp9GJJ>8Ee-Bm4e)0lr4akDf$uId52}Q{(pM2X2*Z9shNqX^j@bKD-f&<~|2BWt
zc39MqWGq=dS~3!Y@;*tGr@A&D4K5>y0-cMbDcOw8<)c$J;@~4wx`R}`s~&Nvns~jL
zY4!CzfgLVrHoDrM5na3S7_~_h(_smcwVL~lB@)K-5Y%62IoYlfQwVm-=Lg1}^+a29
z|Lu)AdV8?dlv7APfvv>c!WA{KsV@B8oD^O~Rh941%B4wp>`X=Q1Rd-V2V$>b74y`D
f7SACF>*6tdaB(jFJ<!y_e-EO<qB*xi`N#eTptFW-

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPassage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPassage.java
index 4c7a8f59a..1830d7841 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPassage.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPassage.java
@@ -35,7 +35,7 @@ import com.watabou.noosa.Game;
 public class ScrollOfPassage extends ExoticScroll {
 	
 	{
-		icon = ItemSpriteSheet.Icons.SCROLL_ENCHANT;
+		icon = ItemSpriteSheet.Icons.SCROLL_PASSAGE;
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
index c38a34914..f02558519 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
@@ -712,8 +712,17 @@ public class ItemSpriteSheet {
 		public static final int RING_WEALTH     = RINGS+10;
 		public static final int RING_UNUSED     = RINGS+11;
 		static {
-			for (int i = RINGS; i < RINGS+16; i++)
-				assignIconRect(i, 8, 8);
+			assignIconRect( RING_ACCURACY,      7, 7 );
+			assignIconRect( RING_ELEMENTS,      7, 7 );
+			assignIconRect( RING_ENERGY,        7, 5 );
+			assignIconRect( RING_EVASION,       7, 7 );
+			assignIconRect( RING_FORCE,         7, 5 );
+			assignIconRect( RING_FUROR,         6, 6 );
+			assignIconRect( RING_HASTE,         6, 6 );
+			assignIconRect( RING_MIGHT,         7, 7 );
+			assignIconRect( RING_SHARPSHOOT,    7, 7 );
+			assignIconRect( RING_TENACITY,      6, 6 );
+			assignIconRect( RING_WEALTH,        6, 6 );
 		}
 
 		                                                                                //16 free slots
@@ -738,9 +747,9 @@ public class ItemSpriteSheet {
 			assignIconRect( SCROLL_MIRRORIMG,   7, 5 );
 			assignIconRect( SCROLL_RECHARGE,    7, 5 );
 			assignIconRect( SCROLL_TELEPORT,    7, 7 );
-			assignIconRect( SCROLL_LULLABY,     4, 5 );
+			assignIconRect( SCROLL_LULLABY,     7, 6 );
 			assignIconRect( SCROLL_MAGICMAP,    7, 7 );
-			assignIconRect( SCROLL_RAGE,        5, 5 );
+			assignIconRect( SCROLL_RAGE,        6, 6 );
 			assignIconRect( SCROLL_RETRIB,      5, 6 );
 			assignIconRect( SCROLL_TERROR,      5, 7 );
 			assignIconRect( SCROLL_TRANSMUTE,   7, 7 );
@@ -761,14 +770,14 @@ public class ItemSpriteSheet {
 		public static final int SCROLL_POLYMORPH= EXOTIC_SCROLLS+11;
 		static {
 			assignIconRect( SCROLL_ENCHANT,     7, 7 );
-			assignIconRect( SCROLL_DIVINATE,    7, 7 );
+			assignIconRect( SCROLL_DIVINATE,    7, 6 );
 			assignIconRect( SCROLL_ANTIMAGIC,   7, 7 );
 			assignIconRect( SCROLL_PRISIMG,     5, 7 );
 			assignIconRect( SCROLL_MYSTENRG,    7, 5 );
 			assignIconRect( SCROLL_PASSAGE,     5, 7 );
 			assignIconRect( SCROLL_AFFECTION,   7, 6 );
 			assignIconRect( SCROLL_FORESIGHT,   7, 5 );
-			assignIconRect( SCROLL_CONFUSION,   4, 7 );
+			assignIconRect( SCROLL_CONFUSION,   7, 7 );
 			assignIconRect( SCROLL_PSIBLAST,    5, 6 );
 			assignIconRect( SCROLL_PETRIF,      7, 5 );
 			assignIconRect( SCROLL_POLYMORPH,   7, 6 );
@@ -793,15 +802,15 @@ public class ItemSpriteSheet {
 			assignIconRect( POTION_STRENGTH,    7, 7 );
 			assignIconRect( POTION_HEALING,     6, 7 );
 			assignIconRect( POTION_MINDVIS,     7, 5 );
-			assignIconRect( POTION_FROST,       5, 7 );
+			assignIconRect( POTION_FROST,       7, 7 );
 			assignIconRect( POTION_LIQFLAME,    5, 7 );
 			assignIconRect( POTION_TOXICGAS,    7, 7 );
 			assignIconRect( POTION_HASTE,       6, 6 );
 			assignIconRect( POTION_INVIS,       5, 7 );
-			assignIconRect( POTION_LEVITATE,    5, 5 );
+			assignIconRect( POTION_LEVITATE,    6, 7 );
 			assignIconRect( POTION_PARAGAS,     7, 7 );
-			assignIconRect( POTION_PURITY,      5, 5 );
-			assignIconRect( POTION_EXP,         5, 5 );
+			assignIconRect( POTION_PURITY,      5, 7 );
+			assignIconRect( POTION_EXP,         7, 7 );
 		}
 
 		private static final int EXOTIC_POTIONS =                            xy(1, 7);  //16 slots
@@ -818,18 +827,18 @@ public class ItemSpriteSheet {
 		public static final int POTION_CLEANSE  = EXOTIC_POTIONS+10;
 		public static final int POTION_HOLYFUROR= EXOTIC_POTIONS+11;
 		static {
-			assignIconRect( POTION_ARENSURGE,   7, 7);
-			assignIconRect( POTION_SHIELDING,   6, 7);
-			assignIconRect( POTION_MAGISIGHT,   7, 5);
-			assignIconRect( POTION_SNAPFREEZ,   5, 7);
-			assignIconRect( POTION_DRGBREATH,   5, 7);
-			assignIconRect( POTION_CORROGAS,    7, 7);
-			assignIconRect( POTION_STAMINA,     6, 6);
-			assignIconRect( POTION_SHROUDFOG,   5, 7);
-			assignIconRect( POTION_STRMCLOUD,   5, 5);
-			assignIconRect( POTION_EARTHARMR,   7, 7);
-			assignIconRect( POTION_CLEANSE,     5, 5);
-			assignIconRect( POTION_HOLYFUROR,   5, 5);
+			assignIconRect( POTION_ARENSURGE,   7, 7 );
+			assignIconRect( POTION_SHIELDING,   6, 6 );
+			assignIconRect( POTION_MAGISIGHT,   7, 5 );
+			assignIconRect( POTION_SNAPFREEZ,   7, 7 );
+			assignIconRect( POTION_DRGBREATH,   7, 7 );
+			assignIconRect( POTION_CORROGAS,    7, 7 );
+			assignIconRect( POTION_STAMINA,     6, 6 );
+			assignIconRect( POTION_SHROUDFOG,   7, 7 );
+			assignIconRect( POTION_STRMCLOUD,   7, 7 );
+			assignIconRect( POTION_EARTHARMR,   6, 6 );
+			assignIconRect( POTION_CLEANSE,     7, 7 );
+			assignIconRect( POTION_HOLYFUROR,   5, 7 );
 		}
 
 		                                                                                //16 free slots
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
index d02f661ac..2b5228545 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
@@ -409,7 +409,7 @@ public class WndJournal extends WndTabbed {
 			ArrayList<QuickRecipe> toAdd = QuickRecipe.getRecipes(currentPageIdx);
 			
 			float left;
-			float top = body.bottom();
+			float top = body.bottom()+1;
 			int w;
 			ArrayList<QuickRecipe> toAddThisRow = new ArrayList<>();
 			while (!toAdd.isEmpty()){