v2.5.0: code improvements to item desc vs. item info methods

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Waterskin.java

@@ -127,7 +127,7 @@ public class Waterskin extends Item {
 
 	@Override
 	public String info() {
-		String info = desc();
+		String info = super.info();
 
 		if (volume == 0){
 			info += "\n\n" + Messages.get(this, "desc_water");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java

@@ -498,7 +498,7 @@ public class Armor extends EquipableItem {
 	
 	@Override
 	public String info() {
-		String info = desc();
+		String info = super.info();
 		
 		if (levelKnown) {
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java

@@ -138,13 +138,13 @@ public class Artifact extends KindofMisc {
 	@Override
 	public String info() {
 		if (cursed && cursedKnown && !isEquipped( Dungeon.hero )) {
-			return desc() + "\n\n" + Messages.get(Artifact.class, "curse_known");
+			return super.info() + "\n\n" + Messages.get(Artifact.class, "curse_known");
 			
 		} else if (!isIdentified() && cursedKnown && !isEquipped( Dungeon.hero)) {
-			return desc()+ "\n\n" + Messages.get(Artifact.class, "not_cursed");
+			return super.info() + "\n\n" + Messages.get(Artifact.class, "not_cursed");
 			
 		} else {
-			return desc();
+			return super.info();
 			
 		}
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java

@@ -198,10 +198,10 @@ public class Pasty extends Food {
 	}
 
 	@Override
-	public String info() {
+	public String desc() {
 		switch(Holiday.getCurrentHoliday()){
 			case NONE: default:
-				return super.info();
+				return super.desc();
 			case LUNAR_NEW_YEAR:
 				return Messages.get(this, "fish_desc");
 			case APRIL_FOOLS:

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java

@@ -370,8 +370,8 @@ public class Potion extends Item {
 	}
 
 	@Override
-	public String info() {
+	public String desc() {
-		return isKnown() ? desc() : Messages.get(this, "unknown_desc");
+		return isKnown() ? super.desc() : Messages.get(this, "unknown_desc");
 	}
 	
 	@Override

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

@@ -161,10 +161,15 @@ public class Ring extends KindofMisc {
 		return isKnown() ? super.name() : Messages.get(Ring.class, gem);
 	}
 
+	@Override
+	public String desc() {
+		return isKnown() ? super.desc() : Messages.get(this, "unknown_desc");
+	}
+	
 	@Override
 	public String info(){
 
-		String desc = isKnown() ? super.desc() : Messages.get(this, "unknown_desc");
+		String desc = super.info();
 		
 		if (cursed && isEquipped( Dungeon.hero )) {
 			desc += "\n\n" + Messages.get(Ring.class, "cursed_worn");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java

@@ -231,10 +231,8 @@ public abstract class Scroll extends Item {
 	}
 
 	@Override
-	public String info() {
+	public String desc() {
-		return isKnown() ?
+		return isKnown() ? super.desc() : Messages.get(this, "unknown_desc");
-			desc() :
-			Messages.get(this, "unknown_desc");
 	}
 	
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/Trinket.java

@@ -60,9 +60,9 @@ public abstract class Trinket extends Item {
 
 	@Override
 	public String info() {
-		String desc = desc();
+		String info = super.info();
-		desc += "\n\n" + statsDesc();
+		info += "\n\n" + statsDesc();
-		return desc;
+		return info;
 	}
 
 	public abstract String statsDesc();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java

@@ -253,7 +253,7 @@ public abstract class Wand extends Item {
 
 	@Override
 	public String info() {
-		String desc = desc();
+		String desc = super.info();
 
 		desc += "\n\n" + statsDesc();
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java

@@ -135,7 +135,7 @@ public class SpiritBow extends Weapon {
 
 	@Override
 	public String info() {
-		String info = desc();
+		String info = super.info();
 		
 		info += "\n\n" + Messages.get( SpiritBow.class, "stats",
 				Math.round(augment.damageFactor(min())),

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java

@@ -333,7 +333,7 @@ public class MeleeWeapon extends Weapon {
 	@Override
 	public String info() {
 
-		String info = desc();
+		String info = super.info();
 
 		if (levelKnown) {
 			info += "\n\n" + Messages.get(MeleeWeapon.class, "stats_known", tier, augment.damageFactor(min()), augment.damageFactor(max()), STRReq());

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java

@@ -451,7 +451,7 @@ abstract public class MissileWeapon extends Weapon {
 	@Override
 	public String info() {
 
-		String info = desc();
+		String info = super.info();
 		
 		info += "\n\n" + Messages.get( MissileWeapon.class, "stats",
 				tier,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java

@@ -227,7 +227,7 @@ public abstract class Plant implements Bundlable {
 
 		@Override
 		public String info() {
-			return Messages.get( Seed.class, "info", desc() );
+			return Messages.get( Seed.class, "info", super.info() );
 		}
 		
 		public static class PlaceHolder extends Seed {