v0.9.0: adjusted frost/chill/burning when the hero is immune to them

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

@@ -75,6 +75,13 @@ public class Burning extends Buff implements Hero.Doom {
 		burnIncrement = bundle.getInt( BURN );
 	}
 
+	@Override
+	public boolean attachTo(Char target) {
+		Buff.detach( target, Chill.class);
+
+		return super.attachTo(target);
+	}
+
 	@Override
 	public boolean act() {
 		

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

@@ -39,15 +39,9 @@ public class Chill extends FlavourBuff {
 
 	@Override
 	public boolean attachTo(Char target) {
-		//can't chill what's frozen!
+		Buff.detach( target, Burning.class );
-		if (target.buff(Frost.class) != null) return false;
 
-		if (super.attachTo(target)){
+		return super.attachTo(target);
-			Buff.detach( target, Burning.class );
-			return true;
-		} else {
-			return false;
-		}
 	}
 
 	//reduces speed by 10% for every turn remaining, capping at 50%

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

@@ -49,10 +49,11 @@ public class Frost extends FlavourBuff {
 	
 	@Override
 	public boolean attachTo( Char target ) {
+		Buff.detach( target, Burning.class );
+
 		if (super.attachTo( target )) {
 			
 			target.paralysed++;
-			Buff.detach( target, Burning.class );
 			Buff.detach( target, Chill.class );
 
 			if (target instanceof Hero) {
@@ -138,4 +139,9 @@ public class Frost extends FlavourBuff {
 		return Messages.get(this, "desc", dispTurns());
 	}
 
+	{
+		//can't chill what's frozen!
+		immunities.add( Chill.class );
+	}
+
 }