v1.2.0: buff icons in the full UI now use text to convey state

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AdrenalineSurge.java

@@ -67,6 +67,11 @@ public class AdrenalineSurge extends Buff {
 		return Math.max(0, (DURATION - visualcooldown()) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)visualcooldown());
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArcaneArmor.java

@@ -87,6 +87,11 @@ public class ArcaneArmor extends Buff {
 		return 0;
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(level);
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ArtifactRecharge.java

@@ -96,6 +96,11 @@ public class ArtifactRecharge extends Buff {
 		return Math.max(0, (DURATION - left) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java

@@ -82,6 +82,11 @@ public class Barkskin extends Buff {
 		return 0;
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(level);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java

@@ -82,6 +82,11 @@ public class Barrier extends ShieldBuff {
 		icon.hardlight(0.5f, 1f, 2f);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(shielding());
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java

@@ -35,6 +35,8 @@ import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.GameMath;
 
+import java.text.DecimalFormat;
+
 public class Berserk extends Buff {
 
 	private enum State{
@@ -192,6 +194,15 @@ public class Berserk extends Buff {
 		}
 	}
 
+	public String iconTextDisplay(){
+		switch (state){
+			case NORMAL: case BERSERK: default:
+				return (int)(power*100) + "%";
+			case RECOVERING:
+				return new DecimalFormat("#.#").format(levelRecovery);
+		}
+	}
+
 	@Override
 	public String toString() {
 		switch (state){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java

@@ -68,6 +68,11 @@ public class Bleeding extends Buff {
 		return BuffIndicator.BLEEDING;
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(Math.round(level));
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java

@@ -103,6 +103,11 @@ public class Buff extends Actor {
 		return 0;
 	}
 
+	//text to display on large buff icons in the desktop UI
+	public String iconTextDisplay(){
+		return "";
+	}
+
 	//visual effect usually attached to the sprite of the character the buff is attacked to
 	public void fx(boolean on) {
 		//do nothing by default

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java

@@ -182,6 +182,11 @@ public class Burning extends Buff implements Hero.Doom {
 		return Math.max(0, (DURATION - left) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)left);
+	}
+
 	@Override
 	public void fx(boolean on) {
 		if (on) target.sprite.add(CharSprite.State.BURNING);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java

@@ -77,6 +77,11 @@ public class Combo extends Buff implements ActionIndicator.Action {
 		return Math.max(0, (initialComboTime - comboTime)/ initialComboTime);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)comboTime);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corrosion.java

@@ -71,6 +71,11 @@ public class Corrosion extends Buff implements Hero.Doom {
 		icon.hardlight(1f, 0.5f, 0f);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)damage);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Dread.java

@@ -102,6 +102,11 @@ public class Dread extends Buff {
 		return Math.max(0, (DURATION - left) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(left);
+	}
+
 	@Override
 	public void tintIcon(Image icon) {
 		icon.hardlight(1, 0, 0);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java

@@ -44,6 +44,11 @@ public class Drowsy extends Buff {
 		return Math.max(0, (DURATION - visualcooldown()) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)visualcooldown());
+	}
+
 	public boolean attachTo(Char target ) {
 		if (!target.isImmune(Sleep.class) && super.attachTo(target)) {
 			if (cooldown() == 0) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java

@@ -91,7 +91,12 @@ public class FireImbue extends Buff {
 
 	@Override
 	public float iconFadePercent() {
-		return Math.max(0, (DURATION - left+1) / DURATION);
+		return Math.max(0, (DURATION - left) / DURATION);
+	}
+
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)left);
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FlavourBuff.java

@@ -34,4 +34,9 @@ public class FlavourBuff extends Buff {
 	protected String dispTurns() {
 		return dispTurns(visualcooldown());
 	}
+
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)visualcooldown());
+	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java

@@ -110,6 +110,11 @@ public class Healing extends Buff {
 		return BuffIndicator.HEALING;
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(healingLeft);
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Momentum.java

@@ -135,6 +135,17 @@ public class Momentum extends Buff implements ActionIndicator.Action {
 		}
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		if (freerunTurns > 0){
+			return Integer.toString(freerunTurns);
+		} else if (freerunCooldown > 0){
+			return Integer.toString(freerunCooldown);
+		} else {
+			return Integer.toString(momentumStacks);
+		}
+	}
+
 	@Override
 	public String toString() {
 		if (freerunTurns > 0){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java

@@ -62,6 +62,11 @@ public class Ooze extends Buff {
 		return Math.max(0, (DURATION - left) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)left);
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java

@@ -75,6 +75,10 @@ public class Poison extends Buff implements Hero.Doom {
 		icon.hardlight(0.6f, 0.2f, 0.6f);
 	}
 
+	public String iconTextDisplay(){
+		return Integer.toString((int) left);
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java

@@ -195,6 +195,11 @@ public class Preparation extends Buff implements ActionIndicator.Action {
 		}
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(turnsInvis);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PrismaticGuard.java

@@ -120,6 +120,11 @@ public class PrismaticGuard extends Buff {
 		return 1f - HP/(float)maxHP();
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)HP);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java

@@ -65,6 +65,16 @@ public class ScrollEmpower extends Buff {
 		icon.hardlight(1, 1, 0);
 	}
 
+	@Override
+	public float iconFadePercent() {
+		return Math.max(0, (2f - left) / 2f);
+	}
+
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java

@@ -81,6 +81,11 @@ public class ToxicImbue extends Buff {
 		return Math.max(0, (DURATION - left) / DURATION);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString((int)left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WandEmpower.java

@@ -47,6 +47,11 @@ public class WandEmpower extends Buff {
 		return Math.max(0, (3-left) / 3f);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/WellFed.java

@@ -70,6 +70,11 @@ public class WellFed extends Buff {
 		return Math.max(0, (Hunger.STARVING - left) / Hunger.STARVING);
 	}
 
+	@Override
+	public String iconTextDisplay() {
+		return Integer.toString(left);
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java

@@ -128,6 +128,11 @@ public class Viscosity extends Glyph {
 			return BuffIndicator.DEFERRED;
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(damage);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java

@@ -112,6 +112,11 @@ public class ElixirOfAquaticRejuvenation extends Elixir {
 			return Math.max(0, (max - left) / max);
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(left);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java

@@ -126,6 +126,11 @@ public class ElixirOfMight extends Elixir {
 			return (5f - left) / 5f;
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(left);
+		}
+
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfChallenge.java

@@ -97,6 +97,11 @@ public class ScrollOfChallenge extends ExoticScroll {
 			return Math.max(0, (DURATION - left) / DURATION);
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(left);
+		}
+
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

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

@@ -258,6 +258,11 @@ public class WandOfLivingEarth extends DamageWand {
 			return Math.max(0, (armorToGuardian() - armor) / (float)armorToGuardian());
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(armor);
+		}
+
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java

@@ -75,6 +75,11 @@ public class Kinetic extends Weapon.Enchantment {
 			}
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(damageBonus());
+		}
+		
 		private float preservedDamage;
 		
 		public void setBonus(int bonus){

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

@@ -127,6 +127,11 @@ public class Earthroot extends Plant {
 			return Math.max(0, (target.HT - level) / (float) target.HT);
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(level);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

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

@@ -131,6 +131,11 @@ public class Sungrass extends Plant {
 			return Math.max(0, (target.HT - level) / (float)target.HT);
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString(level);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

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

@@ -90,6 +90,11 @@ public class Swiftthistle extends Plant {
 			return Math.max(0, (6f - left) / 6f);
 		}
 
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString((int)left);
+		}
+		
 		public void reset(){
 			left = 7f;
 		}

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

@@ -25,11 +25,14 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndInfoBuff;
 import com.watabou.gltextures.SmartTexture;
 import com.watabou.gltextures.TextureCache;
+import com.watabou.noosa.BitmapText;
 import com.watabou.noosa.Image;
 import com.watabou.noosa.TextureFilm;
 import com.watabou.noosa.audio.Sample;
@@ -204,8 +207,8 @@ public class BuffIndicator extends Component {
 
 		private boolean large;
 
-		//Todo maybe move into buff icon?
+		public Image grey; //only for small
-		public Image grey;
+		public BitmapText text; //only for large
 
 		//TODO for large buffs there is room to have text instead of fading
 		public BuffButton( Buff buff, boolean large ){
@@ -214,6 +217,7 @@ public class BuffIndicator extends Component {
 			this.large = large;
 
 			bringToFront(grey);
+			bringToFront(text);
 		}
 
 		@Override
@@ -221,17 +225,31 @@ public class BuffIndicator extends Component {
 			super.createChildren();
 			grey = new Image( TextureCache.createSolid(0xCC666666));
 			add( grey );
+
+			text = new BitmapText(PixelScene.pixelFont);
+			add( text );
 		}
 
 		public void updateIcon(){
 			((BuffIcon)icon).refresh(buff);
 			//round up to the nearest pixel if <50% faded, otherwise round down
-			float fadeHeight = buff.iconFadePercent() * icon.height();
+			if (!large) {
-			float zoom = (camera() != null) ? camera().zoom : 1;
+				text.visible = false;
-			if (fadeHeight < icon.height()/2f){
+				float fadeHeight = buff.iconFadePercent() * icon.height();
-				grey.scale.set( icon.width(), (float)Math.ceil(zoom*fadeHeight)/zoom);
+				float zoom = (camera() != null) ? camera().zoom : 1;
-			} else {
+				if (fadeHeight < icon.height() / 2f) {
-				grey.scale.set( icon.width(), (float)Math.floor(zoom*fadeHeight)/zoom);
+					grey.scale.set(icon.width(), (float) Math.ceil(zoom * fadeHeight) / zoom);
+				} else {
+					grey.scale.set(icon.width(), (float) Math.floor(zoom * fadeHeight) / zoom);
+				}
+			} else if (!buff.iconTextDisplay().isEmpty()) {
+				grey.visible = false;
+				if (buff.type == Buff.buffType.POSITIVE)        text.hardlight(CharSprite.POSITIVE);
+				else if (buff.type == Buff.buffType.NEGATIVE)   text.hardlight(CharSprite.NEGATIVE);
+				text.alpha(0.6f);
+
+				text.text(buff.iconTextDisplay());
+				text.measure();
 			}
 		}
 
@@ -240,6 +258,14 @@ public class BuffIndicator extends Component {
 			super.layout();
 			grey.x = icon.x = this.x + (large ? 0 : 1);
 			grey.y = icon.y = this.y + (large ? 0 : 2);
+
+			if (text.width > width()){
+				text.scale.set(PixelScene.align(0.5f));
+			} else {
+				text.scale.set(1f);
+			}
+			text.x = this.x + width() - text.width() - 1;
+			text.y = this.y + width() - text.baseLine() - 2;
 		}
 
 		@Override