v2.5.0: added wndUpgrade info for rings

core/src/main/assets/messages/items/items.properties

@@ -924,36 +924,43 @@ items.rings.ringofaccuracy.name=ring of accuracy
 items.rings.ringofaccuracy.stats=When worn, this ring will increase your accuracy by _%s%%._
 items.rings.ringofaccuracy.typical_stats=When worn, this ring will typically increase your accuracy by _%s%%._
 items.rings.ringofaccuracy.combined_stats=Your equipped rings are combining their power, increasing your accuracy by _%s%%_ in total.
+items.rings.ringofaccuracy.upgrade_stat_name_1=Accuracy Boost
 items.rings.ringofaccuracy.desc=This ring increases your focus, making it easier for your attacks to find their mark. A cursed ring will instead make it harder for your attacks to connect.
 
 items.rings.ringofarcana.name=ring of arcana
 items.rings.ringofarcana.stats=When worn, this ring will increase the power of enchantments and glyphs by _%s%%._
 items.rings.ringofarcana.typical_stats=When worn, this ring will typically increase the power of enchantments and glyphs by _%s%%._
 items.rings.ringofarcana.combined_stats=Your equipped rings are combining their power, increasing the power of enchantments and glyphs by _%s%%_ in total.
+items.rings.ringofarcana.upgrade_stat_name_1=Arcana Boost
 items.rings.ringofarcana.desc=This ring enhances magical enchantments on weapons and glyphs on armor, including curses! It first increases activation chance, and then increases the strength of the effect once activation chance is 100%. A cursed ring will instead weaken enchantments, glyphs, and curses.
 
 items.rings.ringofelements.name=ring of elements
 items.rings.ringofelements.stats=When worn, this ring will provide _%s%%_ elemental resistance.
 items.rings.ringofelements.typical_stats=When worn, this ring will typically provide _%s%%_ elemental resistance.
 items.rings.ringofelements.combined_stats=Your equipped rings are combining their power, providing _%s%%_ elemental resistance in total.
+items.rings.ringofelements.upgrade_stat_name_1=Resistance
 items.rings.ringofelements.desc=This ring provides resistance to most elemental and magical effects, decreasing damage and debuff duration. Naturally a cursed ring will instead worsen these effects.
 
 items.rings.ringofenergy.name=ring of energy
 items.rings.ringofenergy.stats=When worn, this ring will increase wand, artifact, and heroic armor charge speed by _%s%%._
 items.rings.ringofenergy.typical_stats=When worn, this ring will typically increase wand, artifact, and heroic armor charge speed by _%s%%._
 items.rings.ringofenergy.combined_stats=Your equipped rings are combining their power, increasing charge speed by _%s%%_ in total.
+items.rings.ringofenergy.upgrade_stat_name_1=Charge Boost
 items.rings.ringofenergy.desc=Your magical equipment will recharge more quickly in the arcane field that radiates from this ring. A cursed ring will instead slow recharge.
 
 items.rings.ringofevasion.name=ring of evasion
 items.rings.ringofevasion.stats=When worn, this ring will increase your evasion by _%s%%._
 items.rings.ringofevasion.typical_stats=When worn, this ring will typically increase your evasion by _%s%%._
 items.rings.ringofevasion.combined_stats=Your equipped rings are combining their power, increasing your evasion by _%s%%_ in total.
+items.rings.ringofevasion.upgrade_stat_name_1=Evasion Boost
 items.rings.ringofevasion.desc=This ring quickens the wearer's reactions, making it harder to land blows on them. A cursed ring will instead make the user easier to strike.
 
 items.rings.ringofforce.name=ring of force
 items.rings.ringofforce.stats=When unarmed, at your current strength, this ring will deal _%1$d-%2$d damage._ With a weapon equipped, this ring will increase damage by _%3$d._
 items.rings.ringofforce.typical_stats=When unarmed, at your current strength, typically this ring will deal _%1$d-%2$d damage._ With a weapon equipped, typically this ring will increase damage by _%3$d._
 items.rings.ringofforce.combined_stats=Your equipped rings are combining their power, dealing a total of _%1$d-%2$d damage_ without a weapon, or increasing damage by _%3$d_ with one.
+items.rings.ringofforce.upgrade_stat_name_1=Unarmed Damage
+items.rings.ringofforce.upgrade_stat_name_2=Armed Damage Boost
 items.rings.ringofforce.ability_name=brawler's stance
 items.rings.ringofforce.typical_ability_desc=The Duelist can adopt a _brawler's stance_ with this ring, causing her regular attacks to always use this ring even with a weapon equipped. These attacks will typically deal _%1$d-%2$d damage_ and will also inherit the weapon's enchantment and augmentation. This stance slows weapon recharging speed by 50%%.
 items.rings.ringofforce.ability_desc=The Duelist can adopt a _brawler's stance_ with this ring, causing her regular attacks to always use this ring even with a weapon equipped. These attacks will deal _%1$d-%2$d damage_ and will also inherit the weapon's enchantment and augmentation. This stance slows weapon recharging speed by 50%%.
@@ -965,36 +972,44 @@ items.rings.ringoffuror.name=ring of furor
 items.rings.ringoffuror.stats=When worn, this ring will increase the speed of your attacks by _%s%%._
 items.rings.ringoffuror.typical_stats=When worn, this ring will typically increase the speed of your attacks by _%s%%._
 items.rings.ringoffuror.combined_stats=Your equipped rings are combining their power, increasing the speed of your attacks by _%s%%_ in total.
+items.rings.ringoffuror.upgrade_stat_name_1=Attack Speed Boost
 items.rings.ringoffuror.desc=This ring grants the wearer an inner fury, allowing them to attack more rapidly. A cursed ring will instead slow the wearer's speed of attack.
 
 items.rings.ringofhaste.name=ring of haste
 items.rings.ringofhaste.stats=When worn, this ring will increase your movement speed by _%s%%._
 items.rings.ringofhaste.typical_stats=When worn, this ring will typically increase your movement speed by _%s%%._
 items.rings.ringofhaste.combined_stats=Your equipped rings are combining their power, increasing your movement speed by _%s%%_ in total.
+items.rings.ringofhaste.upgrade_stat_name_1=Move Speed Boost
 items.rings.ringofhaste.desc=This ring reduces the stress of movement on the wearer, allowing them to run at superhuman speeds. A cursed ring will instead weigh the wearer down.
 
 items.rings.ringofmight.name=ring of might
 items.rings.ringofmight.stats=When worn, this ring will increase your strength by _%1$d_ and your max HP by _%2$s%%._
 items.rings.ringofmight.typical_stats=When worn, this ring will typically increase your strength by _%1$d_ and your max HP by _%2$s%%._
 items.rings.ringofmight.combined_stats=Your equipped rings are combining their power, boosting your strength by _%1$d_ and max HP by _%2$s%%_ in total.
+items.rings.ringofmight.upgrade_stat_name_1=Strength Boost
+items.rings.ringofmight.upgrade_stat_name_2=Max HP Boost
 items.rings.ringofmight.desc=This ring enhances the physical traits of the wearer, granting them greater physical strength and constitution. A cursed ring will weaken the wearer.
 
 items.rings.ringofsharpshooting.name=ring of sharpshooting
 items.rings.ringofsharpshooting.stats=When worn, this ring will boost the damage of your thrown weapons as if their level was increased by _%1$d_, and will increase their durability by _%2$s%%._
 items.rings.ringofsharpshooting.typical_stats=When worn, this ring will typically boost the damage of your thrown weapons as if their level was increased by _%1$d_ and will increase their durability by _%2$s%%._
 items.rings.ringofsharpshooting.combined_stats=Your equipped rings are combining their power, boosting effective thrown weapon level by _%1$d_ and increasing their durability by _%2$s%%_ in total.
+items.rings.ringofsharpshooting.upgrade_stat_name_1=Level Damage Boost
+items.rings.ringofsharpshooting.upgrade_stat_name_2=Durability Boost
 items.rings.ringofsharpshooting.desc=This ring enhances the wearer's precision and aim, which will make all projectile weapons more damaging and durable. A cursed ring will have the opposite effect.
 
 items.rings.ringoftenacity.name=ring of tenacity
 items.rings.ringoftenacity.stats=When worn, this ring will reduce the damage you take by up to _%s%%._
 items.rings.ringoftenacity.typical_stats=When worn, this ring will typically reduce the damage you take by up to _%s%%._
 items.rings.ringoftenacity.combined_stats=Your equipped rings are combining their power, reducing the damage you take by up to _%s%%_ in total.
+items.rings.ringoftenacity.upgrade_stat_name_1=Max Damage Resist
 items.rings.ringoftenacity.desc=When worn, this ring will allow the wearer to resist normally mortal strikes. The more injured the user is, the more resistant they will be to damage. A cursed ring will instead make it easier for enemies to execute the wearer.
 
 items.rings.ringofwealth.name=ring of wealth
 items.rings.ringofwealth.stats=When worn, this ring will increase your luck by _%s%%._
 items.rings.ringofwealth.typical_stats=When worn, this ring will typically increase your luck by _%s%%._
 items.rings.ringofwealth.combined_stats=Your equipped rings are combining their power, increasing your luck by _%s%%_ in total.
+items.rings.ringofwealth.upgrade_stat_name_1=Luck Boost
 items.rings.ringofwealth.desc=This ring acts like a magnet for treasure, increasing the likelihood that enemies and containers will be carrying valuable items. A cursed ring will instead reduce your chance of receiving loot.
 
 

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

@@ -187,6 +187,14 @@ public class Ring extends KindofMisc {
 	protected String statsInfo(){
 		return "";
 	}
+
+	public String upgradeStat1(int level){
+		return null;
+	}
+
+	public String upgradeStat2(int level){
+		return null;
+	}
 	
 	@Override
 	public Item upgrade() {

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

@@ -45,6 +45,10 @@ public class RingOfAccuracy extends Ring {
 			return Messages.get(this, "typical_stats", Messages.decimalFormat("#.##", 30f));
 		}
 	}
+
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.3f, level+1)-1f)) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -46,6 +46,10 @@ public class RingOfArcana extends Ring {
 		}
 	}
 
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.175f, level+1)-1f)) + "%";
+	}
+
 	@Override
 	protected RingBuff buff( ) {
 		return new Arcana();

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

@@ -57,6 +57,10 @@ public class RingOfElements extends Ring {
 			return Messages.get(this, "typical_stats", Messages.decimalFormat("#.##", 17.5f));
 		}
 	}
+
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (1f - Math.pow(0.825f, level+1))) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -49,6 +49,10 @@ public class RingOfEnergy extends Ring {
 					Messages.decimalFormat("#.##", 15f));
 		}
 	}
+
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.15f, level+1)-1f)) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -45,6 +45,10 @@ public class RingOfEvasion extends Ring {
 			return Messages.get(this, "typical_stats", Messages.decimalFormat("#.##", 12.5f));
 		}
 	}
+
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.125f, level+1)-1f)) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -131,6 +131,17 @@ public class RingOfForce extends Ring {
 		}
 	}
 
+	@Override
+	public String upgradeStat1(int level) {
+		float tier = tier(Dungeon.hero != null ? Dungeon.hero.STR() : 10);
+		return min(level+1, tier) + "-" + max(level+1, tier);
+	}
+
+	@Override
+	public String upgradeStat2(int level) {
+		return Integer.toString(level+1);
+	}
+
 	public class Force extends RingBuff {
 	}
 

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

@@ -46,6 +46,10 @@ public class RingOfFuror extends Ring {
 		}
 	}
 
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.09051f, level+1)-1f)) + "%";
+	}
+
 	@Override
 	protected RingBuff buff( ) {
 		return new Furor();

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

@@ -45,6 +45,10 @@ public class RingOfHaste extends Ring {
 			return Messages.get(this, "typical_stats", Messages.decimalFormat("#.##", 20f));
 		}
 	}
+
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.2f, level+1)-1f)) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -88,6 +88,16 @@ public class RingOfMight extends Ring {
 		}
 	}
 
+	@Override
+	public String upgradeStat1(int level) {
+		return Integer.toString(level+1);
+	}
+
+	@Override
+	public String upgradeStat2(int level) {
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.035, level+1)-1f)) + "%";
+	}
+
 	@Override
 	protected RingBuff buff( ) {
 		return new Might();

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

@@ -45,6 +45,16 @@ public class RingOfSharpshooting extends Ring {
 			return Messages.get(this, "typical_stats", 1, Messages.decimalFormat("#.##", 20f));
 		}
 	}
+
+	@Override
+	public String upgradeStat1(int level) {
+		return Integer.toString(level+1);
+	}
+
+	@Override
+	public String upgradeStat2(int level) {
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.2, level+1)-1f)) + "%";
+	}
 	
 	@Override
 	protected RingBuff buff( ) {

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

@@ -46,6 +46,10 @@ public class RingOfTenacity extends Ring {
 		}
 	}
 
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (1f - Math.pow(0.85f, level+1))) + "%";
+	}
+
 	@Override
 	protected RingBuff buff( ) {
 		return new Tenacity();

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

@@ -75,6 +75,10 @@ public class RingOfWealth extends Ring {
 		}
 	}
 
+	public String upgradeStat1(int level){
+		return Messages.decimalFormat("#.##", 100f * (Math.pow(1.2f, level+1)-1f)) + "%";
+	}
+
 	private static final String TRIES_TO_DROP = "tries_to_drop";
 	private static final String DROPS_TO_RARE = "drops_to_rare";
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUpgrade.java

@@ -243,9 +243,20 @@ public class WndUpgrade extends Window {
 					bottom);
 		}
 
-		//TODO Various ring stats (varies by ring)
+		//Various ring stats (varies by ring)
 		if (toUpgrade instanceof Ring){
-
+			if (((Ring) toUpgrade).upgradeStat1(levelFrom) != null){
+				bottom = fillFields(Messages.get(toUpgrade, "upgrade_stat_name_1"),
+						((Ring) toUpgrade).upgradeStat1(levelFrom),
+						((Ring) toUpgrade).upgradeStat1(levelTo),
+						bottom);
+			}
+			if (((Ring) toUpgrade).upgradeStat2(levelFrom) != null){
+				bottom = fillFields(Messages.get(toUpgrade, "upgrade_stat_name_2"),
+						((Ring) toUpgrade).upgradeStat2(levelFrom),
+						((Ring) toUpgrade).upgradeStat2(levelTo),
+						bottom);
+			}
 		}
 
 		//visual separators for each column