v0.6.2: many buffs now grey out their icons as they expire

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

@@ -23,9 +23,12 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Bless extends FlavourBuff {
 	
+	public static final float DURATION	= 30f;
+	
 	{
 		type = buffType.POSITIVE;
 	}
@@ -35,6 +38,11 @@ public class Bless extends FlavourBuff {
 		return BuffIndicator.BLESS;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -59,12 +59,11 @@ public class Combo extends Buff implements ActionIndicator.Action {
 	
 	@Override
 	public void tintIcon(Image icon) {
-		if (count >= 10)    icon.hardlight(1f, 0f, 0f);
+		if (comboTime >= 3f){
-		else if (count >= 8)icon.hardlight(1f, 0.8f, 0f);
+			icon.resetColor();
-		else if (count >= 6)icon.hardlight(1f, 1f, 0f);
+		} else {
-		else if (count >= 4)icon.hardlight(0.8f, 1f, 0f);
+			icon.tint(0xb3b3b3, 0.5f + 0.5f*(3f + 1 - comboTime)/3f);
-		else if (count >= 2)icon.hardlight(0f, 1f, 0f);
+		}
-		else                icon.resetColor();
 	}
 	
 	@Override
@@ -108,6 +107,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
 	public boolean act() {
 		comboTime-=TICK;
 		spend(TICK);
+		BuffIndicator.refreshHero();
 		if (comboTime <= 0) {
 			detach();
 		}

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

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class EarthImbue extends FlavourBuff {
 
@@ -41,6 +42,11 @@ public class EarthImbue extends FlavourBuff {
 		return BuffIndicator.ROOTS;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
@@ -65,8 +66,11 @@ public class FireImbue extends Buff {
 
 		spend(TICK);
 		left -= TICK;
-		if (left <= 0)
+		if (left < 5){
+			BuffIndicator.refreshHero();
+		} else if (left <= 0) {
 			detach();
+		}
 
 		return true;
 	}
@@ -83,6 +87,11 @@ public class FireImbue extends Buff {
 		return BuffIndicator.FIRE;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		FlavourBuff.greyIcon(icon, 5f, left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -21,6 +21,8 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
+import com.watabou.noosa.Image;
+
 //buff whose only internal logic is to wait and detach after a time.
 public class FlavourBuff extends Buff {
 	
@@ -30,6 +32,14 @@ public class FlavourBuff extends Buff {
 		return true;
 	}
 	
+	public static void greyIcon(Image icon, float startGrey, float remaining){
+		if (remaining >= startGrey){
+			icon.resetColor();
+		} else {
+			icon.tint(0xb3b3b3, 0.6f + 0.3f*(startGrey - remaining)/startGrey);
+		}
+	}
+
 	//flavour buffs can all just rely on cooldown()
 	protected String dispTurns() {
 		//add one turn as buffs act last, we want them to end at 1 visually, even if they end at 0 internally.

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

@@ -28,16 +28,22 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.VenomGas;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class GasesImmunity extends FlavourBuff {
 	
-	public static final float DURATION	= 15f;
+	public static final float DURATION	= 20f;
 	
 	@Override
 	public int icon() {
 		return BuffIndicator.IMMUNITY;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourg
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Invisibility extends FlavourBuff {
 
@@ -64,6 +65,11 @@ public class Invisibility extends FlavourBuff {
 		return BuffIndicator.INVISIBLE;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+
 	@Override
 	public void fx(boolean on) {
 		if (on) target.sprite.add( CharSprite.State.INVISIBLE );

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

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Levitation extends FlavourBuff {
 
@@ -54,6 +55,11 @@ public class Levitation extends FlavourBuff {
 		return BuffIndicator.LEVITATION;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+	
 	@Override
 	public void fx(boolean on) {
 		if (on) target.sprite.add(CharSprite.State.LEVITATING);

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

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Light extends FlavourBuff {
 
@@ -57,6 +58,11 @@ public class Light extends FlavourBuff {
 		return BuffIndicator.LIGHT;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 20f, cooldown());
+	}
+
 	@Override
 	public void fx(boolean on) {
 		if (on) target.sprite.add(CharSprite.State.ILLUMINATED);

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

@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class MindVision extends FlavourBuff {
 
@@ -41,6 +42,11 @@ public class MindVision extends FlavourBuff {
 		return BuffIndicator.MIND_VISION;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		greyIcon(icon, 5f, cooldown());
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Recharging extends FlavourBuff {
 
@@ -31,6 +32,11 @@ public class Recharging extends FlavourBuff {
 		return BuffIndicator.RECHARGING;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		FlavourBuff.greyIcon(icon, 5f, cooldown());
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 
@@ -98,6 +99,11 @@ public class Shadows extends Invisibility {
 		return BuffIndicator.SHADOWS;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		icon.resetColor();
+	}
+	
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

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

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class ToxicImbue extends Buff {
@@ -71,6 +72,11 @@ public class ToxicImbue extends Buff {
 		return BuffIndicator.IMMUNITY;
 	}
 	
+	@Override
+	public void tintIcon(Image icon) {
+		FlavourBuff.greyIcon(icon, 5f, left);
+	}
+
 	@Override
 	public String toString() {
 		return Messages.get(this, "name");

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bless;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Combo;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Fury;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
@@ -478,6 +479,9 @@ public class Hero extends Char {
 			Dungeon.level.updateFieldOfView( this, fieldOfView );
 		}
 		checkVisibleMobs();
+		if (buff(FlavourBuff.class) != null) {
+			BuffIndicator.refreshHero();
+		}
 		
 		if (paralysed > 0) {
 			

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

@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfParalyticGas;
@@ -32,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.watabou.noosa.Camera;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class Earthroot extends Plant {
@@ -113,6 +115,11 @@ public class Earthroot extends Plant {
 			return BuffIndicator.ARMOR;
 		}
 		
+		@Override
+		public void tintIcon(Image icon) {
+			FlavourBuff.greyIcon(icon, target.HT/4f, level);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");

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

@@ -40,7 +40,7 @@ public class Starflower extends Plant {
 	public void activate() {
 		Char ch = Actor.findChar(pos);
 
-		if (ch != null) Buff.prolong(ch, Bless.class, 30f);
+		if (ch != null) Buff.prolong(ch, Bless.class, Bless.DURATION);
 
 		if (Random.Int(5) == 0){
 			Dungeon.level.drop(new Seed(), pos).sprite.drop();

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

@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@@ -33,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class Sungrass extends Plant {
@@ -125,6 +127,11 @@ public class Sungrass extends Plant {
 			return BuffIndicator.HEALING;
 		}
 		
+		@Override
+		public void tintIcon(Image icon) {
+			FlavourBuff.greyIcon(icon, target.HT/4f, level);
+		}
+		
 		@Override
 		public String toString() {
 			return Messages.get(this, "name");