Remove instanceof in Hero.add

src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java

@@ -30,9 +30,14 @@
 public class Bleeding extends Buff {
 
 	protected int level;
-
+	protected static final String TXT_HERO = "You are bleeding!";
 	private static final String LEVEL	= "level";
 
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
 	@Override
 	public void storeInBundle( Bundle bundle ) {
 		super.storeInBundle( bundle );

src/com/watabou/pixeldungeon/actors/buffs/Blindness.java

@@ -22,6 +22,13 @@
 
 public class Blindness extends FlavourBuff {
 
+	protected static final String TXT_HERO = "You are blinded!";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
 	@Override
 	public void detach() {
 		super.detach();

src/com/watabou/pixeldungeon/actors/buffs/Buff.java

@@ -24,7 +24,6 @@
 public class Buff extends Actor {
 
 	public Char target;
-
 	public boolean attachTo( Char target ) {
 
 		if (target.immunities().contains( getClass() )) {
@@ -41,6 +40,9 @@ public void detach() {
 		target.remove( this );
 	}
 
+	public String getHeroText() { return "";};
+	public boolean isInterrupting() { return false; };
+
 	@Override
 	public boolean act() {
 		diactivate();

src/com/watabou/pixeldungeon/actors/buffs/Burning.java

@@ -44,12 +44,20 @@ public class Burning extends Buff implements Hero.Doom {
 
 	private static final String TXT_BURNS_UP		= "%s burns up!";
 	private static final String TXT_BURNED_TO_DEATH	= "You burned to death...";
-
+	protected static final String TXT_HERO = "You catch fire!";
 	private static final float DURATION = 8f;
 
 	private float left;
 
 	private static final String LEFT	= "left";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
+	@Override
+	public boolean isInterrupting() { return true; }
 
 	@Override
 	public void storeInBundle( Bundle bundle ) {

src/com/watabou/pixeldungeon/actors/buffs/Charm.java

@@ -22,6 +22,13 @@
 import com.watabou.pixeldungeon.ui.BuffIndicator;
 
 public class Charm extends FlavourBuff {
+
+	protected static final String TXT_HERO = "You are charmed!";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
 
 	@Override
 	public boolean attachTo( Char target ) {

src/com/watabou/pixeldungeon/actors/buffs/Cripple.java

@@ -21,7 +21,13 @@
 
 public class Cripple extends FlavourBuff {
 
+	protected static final String TXT_HERO = "You are crippled!";
 	public static final float DURATION	= 10f;
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
 
 	@Override
 	public int icon() {

src/com/watabou/pixeldungeon/actors/buffs/Fury.java

@@ -20,9 +20,17 @@
 import com.watabou.pixeldungeon.ui.BuffIndicator;
 
 public class Fury extends Buff {
-
+	protected static final String TXT_HERO = "You become furious!";
 	public static float LEVEL	= 0.4f;
-
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
+	@Override
+	public boolean isInterrupting() { return true; }
+
 	@Override
 	public boolean act() {
 		if (target.HP > target.HT * LEVEL) {

src/com/watabou/pixeldungeon/actors/buffs/Ooze.java

@@ -27,9 +27,15 @@
 public class Ooze extends Buff {
 
 	private static final String TXT_HERO_KILLED = "%s killed you...";
-
+	protected static final String TXT_HERO = "Caustic ooze eats your flesh. Wash away it!";
+
 	public int damage	= 1;
-
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
 	@Override
 	public int icon() {
 		return BuffIndicator.OOZE;

src/com/watabou/pixeldungeon/actors/buffs/Paralysis.java

@@ -24,7 +24,16 @@
 public class Paralysis extends FlavourBuff {
 
 	private static final float DURATION	= 10f;
-
+	protected static final String TXT_HERO = "You are paralysed!";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
+	@Override
+	public boolean isInterrupting() { return true; }
+
 	@Override
 	public boolean attachTo( Char target ) {
 		if (super.attachTo( target )) {

src/com/watabou/pixeldungeon/actors/buffs/Poison.java

@@ -31,9 +31,18 @@
 public class Poison extends Buff implements Hero.Doom {
 
 	protected float left;
-
-	private static final String LEFT	= "left";
-
+	protected static final String TXT_HERO = "You are poisoned!";
+
+	private static final String LEFT = "left";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
+	@Override
+	public boolean isInterrupting() { return true; }
+
 	@Override
 	public void storeInBundle( Bundle bundle ) {
 		super.storeInBundle( bundle );

src/com/watabou/pixeldungeon/actors/buffs/Roots.java

@@ -22,6 +22,13 @@
 
 public class Roots extends FlavourBuff {
 
+	protected static final String TXT_HERO = "You can't move!";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
 	@Override
 	public boolean attachTo( Char target ) {
 		if (!target.flying && super.attachTo( target )) {

src/com/watabou/pixeldungeon/actors/buffs/Vertigo.java

@@ -24,7 +24,16 @@
 public class Vertigo extends FlavourBuff {
 
 	public static final float DURATION	= 10f;
-
+	protected static final String TXT_HERO = "Everything is spinning around you!";
+
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
+	@Override
+	public boolean isInterrupting() { return true; }
+
 	@Override
 	public int icon() {
 		return BuffIndicator.VERTIGO;

src/com/watabou/pixeldungeon/actors/buffs/Weakness.java

@@ -23,9 +23,14 @@
 import com.watabou.pixeldungeon.ui.BuffIndicator;
 
 public class Weakness extends FlavourBuff {
-
+	protected static final String TXT_HERO = "You feel weakened!";
 	private static final float DURATION = 40f;
 
+	@Override
+	public String getHeroText() {
+		return TXT_HERO;
+	}
+
 	@Override
 	public int icon() {
 		return BuffIndicator.WEAKNESS;

src/com/watabou/pixeldungeon/actors/hero/Hero.java

@@ -114,15 +114,14 @@ public class Hero extends Char {
 		"It's easier for you to hit enemies and dodge their attacks.";
 
 	public static final String TXT_YOU_NOW_HAVE	= "You now have %s";
-
 	private static final String TXT_SOMETHING_ELSE	= "There is something else here";
 	private static final String TXT_LOCKED_CHEST	= "This chest is locked and you don't have matching key";
 	private static final String TXT_LOCKED_DOOR		= "You don't have a matching key";
 	private static final String TXT_NOTICED_SMTH	= "You noticed something";
 
 	private static final String TXT_WAIT	= "...";
 	private static final String TXT_SEARCH	= "search";
-	
+
 	public static final int STARTING_STR = 10;
 
 	private static final float TIME_TO_REST		= 1f;
@@ -1068,45 +1067,26 @@ public void add( Buff buff ) {
 		super.add( buff );
 
 		if (sprite != null) {
-			if (buff instanceof Burning) {
-				GLog.w( "You catch fire!" );
-				interrupt();
-			} else if (buff instanceof Paralysis) {
-				GLog.w( "You are paralysed!" );
-				interrupt();
-			} else if (buff instanceof Poison) {
-				GLog.w( "You are poisoned!" );
-				interrupt();
-			} else if (buff instanceof Ooze) {
-				GLog.w( "Caustic ooze eats your flesh. Wash away it!" );
-			} else if (buff instanceof Roots) {
-				GLog.w( "You can't move!" );
-			} else if (buff instanceof Weakness) {
-				GLog.w( "You feel weakened!" );
-			} else if (buff instanceof Blindness) {
-				GLog.w( "You are blinded!" );
-			} else if (buff instanceof Fury) {
-				GLog.w( "You become furious!" );
-				sprite.showStatus( CharSprite.POSITIVE, "furious" );
-			} else if (buff instanceof Charm) {
-				GLog.w( "You are charmed!" );
-			}  else if (buff instanceof Cripple) {
-				GLog.w( "You are crippled!" );
-			} else if (buff instanceof Bleeding) {
-				GLog.w( "You are bleeding!" );
-			} else if (buff instanceof Vertigo) {
-				GLog.w( "Everything is spinning around you!" );
+			String heroText = buff.getHeroText();
+			if (heroText.length() > 0){
+				GLog.w(heroText);
+			}
+			String buffString = buff.toString();
+
+            if (buff.isInterrupting()) {
 				interrupt();
 			}
 
-			else if (buff instanceof Light) {
+			if (buffString == "Fury") {
+				sprite.showStatus( CharSprite.POSITIVE, "furious" );
+			} else if (buffString == "Light") {
 				sprite.add( CharSprite.State.ILLUMINATED );
 			}
 		}
 
 		BuffIndicator.refreshHero();
 	}
-	
+
 	@Override
 	public void remove( Buff buff ) {
 		super.remove( buff );