v0.8.1: added item icon functionality to rings, no icon assets yet

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfAccuracy extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_ACCURACY;
+	}
+	
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (Math.pow(1.3f, soloBuffedBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java

@@ -36,12 +36,17 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.AntiMagic;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 import java.util.HashSet;
 
 public class RingOfElements extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_ELEMENTS;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (1f - Math.pow(0.80f, soloBuffedBonus()))));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEnergy.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfEnergy extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_ENERGY;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (Math.pow(1.30f, soloBuffedBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfEvasion extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_EVASION;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (Math.pow(1.15f, soloBuffedBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java

@@ -25,10 +25,15 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.utils.Random;
 
 public class RingOfForce extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_FORCE;
+	}
+
 	@Override
 	protected RingBuff buff( ) {
 		return new Force();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfFuror extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_FUROR;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (Math.pow(1.105f, soloBuffedBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfHaste extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_HASTE;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (Math.pow(1.2f, soloBuffedBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java

@@ -26,11 +26,16 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfMight extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_MIGHT;
+	}
+
 	@Override
 	public boolean doEquip(Hero hero) {
 		if (super.doEquip(hero)){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfSharpshooting extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_SHARPSHOOT;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", soloBuffedBonus(), new DecimalFormat("#.##").format(100f * (Math.pow(1.2, soloBonus()) - 1f)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java

@@ -23,11 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
 import java.text.DecimalFormat;
 
 public class RingOfTenacity extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_TENACITY;
+	}
+
 	public String statsInfo() {
 		if (isIdentified()){
 			return Messages.get(this, "stats", new DecimalFormat("#.##").format(100f * (1f - Math.pow(0.85f, soloBuffedBonus()))));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java

@@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.spells.ArcaneCatalyst;
 import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
@@ -44,6 +45,10 @@ import java.util.HashSet;
 
 public class RingOfWealth extends Ring {
 
+	{
+		icon = ItemSpriteSheet.Icons.RING_WEALTH;
+	}
+
 	private float triesToDrop = Float.MIN_VALUE;
 	private int dropsToRare = Integer.MIN_VALUE;
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java

@@ -699,6 +699,22 @@ public class ItemSpriteSheet {
 		}
 
 		private static final int RINGS          =                            xy(1, 1);  //16 slots
+		public static final int RING_ACCURACY   = RINGS+0;
+		public static final int RING_ELEMENTS   = RINGS+1;
+		public static final int RING_ENERGY     = RINGS+2;
+		public static final int RING_EVASION    = RINGS+3;
+		public static final int RING_FORCE      = RINGS+4;
+		public static final int RING_FUROR      = RINGS+5;
+		public static final int RING_HASTE      = RINGS+6;
+		public static final int RING_MIGHT      = RINGS+7;
+		public static final int RING_SHARPSHOOT = RINGS+8;
+		public static final int RING_TENACITY   = RINGS+9;
+		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);
+		}
 
 		                                                                                //16 free slots
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java

@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
@@ -191,7 +192,7 @@ public class ItemSlot extends Button {
 
 		status.text( item.status() );
 
-		if (item.icon != -1 && item.isIdentified()){
+		if (item.icon != -1 && (item.isIdentified() || (item instanceof Ring && ((Ring) item).isKnown()))){
 			extra.text( null );
 
 			itemIcon = new Image(Assets.Sprites.ITEM_ICONS);