diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 189fdbca6..07c89986d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -746,7 +746,7 @@ public abstract class Char extends Actor { b.announced = false; b.set(dmg*buff(Sickle.HarvestBleedTracker.class).bleedFactor, Sickle.HarvestBleedTracker.class); b.attachTo(this); - sprite.showStatus(CharSprite.WARNING, Messages.titleCase(b.name()) + " " + (int)b.level()); + sprite.showStatus(CharSprite.NEGATIVE, Messages.titleCase(b.name()) + " " + (int)b.level()); buff(Sickle.HarvestBleedTracker.class).detach(); return; } @@ -825,11 +825,7 @@ public abstract class Char extends Actor { if (src instanceof Corruption) icon = FloatingText.CORRUPTION; if (src instanceof AscensionChallenge) icon = FloatingText.AMULET; - sprite.showStatusWithIcon(HP > HT / 2 ? - CharSprite.WARNING : - CharSprite.NEGATIVE, - Integer.toString(dmg + shielded), - icon); + sprite.showStatusWithIcon(CharSprite.NEGATIVE, Integer.toString(dmg + shielded), icon); } if (HP < 0) HP = 0; @@ -995,7 +991,7 @@ public abstract class Char extends Actor { sprite.showStatus(CharSprite.POSITIVE, Messages.titleCase(buff.name())); break; case NEGATIVE: - sprite.showStatus(CharSprite.NEGATIVE, Messages.titleCase(buff.name())); + sprite.showStatus(CharSprite.WARNING, Messages.titleCase(buff.name())); break; case NEUTRAL: default: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java index 028012da1..18ddeaa4a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredBrute.java @@ -54,7 +54,7 @@ public class ArmoredBrute extends Brute { Buff.affect(this, ArmoredRage.class).setShield(HT/2 + 1); sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(HT/2 + 1), FloatingText.SHIELDING ); if (Dungeon.level.heroFOV[pos]) { - sprite.showStatus( CharSprite.NEGATIVE, Messages.get(this, "enraged") ); + sprite.showStatus( CharSprite.WARNING, Messages.get(this, "enraged") ); } spend( TICK ); hasRaged = true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 22956f47d..553b5065a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -221,7 +221,7 @@ public class Goo extends Mob { ((GooSprite)sprite).pumpUp( pumpedUp ); if (Dungeon.level.heroFOV[pos]) { - sprite.showStatus( CharSprite.NEGATIVE, Messages.get(this, "!!!") ); + sprite.showStatus( CharSprite.WARNING, Messages.get(this, "!!!") ); GLog.n( Messages.get(this, "pumpup") ); } @@ -270,7 +270,7 @@ public class Goo extends Mob { super.damage(dmg, src); if ((HP*2 <= HT) && !bleeding){ BossHealthBar.bleed(true); - sprite.showStatus(CharSprite.NEGATIVE, Messages.get(this, "enraged")); + sprite.showStatus(CharSprite.WARNING, Messages.get(this, "enraged")); ((GooSprite)sprite).spray(true); yell(Messages.get(this, "gluuurp")); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index f2e8ff120..8473919e9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -426,7 +426,7 @@ public abstract class Mob extends Char { if ((buff instanceof Terror && buff(Dread.class) == null) || (buff instanceof Dread && buff(Terror.class) == null)) { if (enemySeen) { - sprite.showStatus(CharSprite.NEGATIVE, Messages.get(this, "rage")); + sprite.showStatus(CharSprite.WARNING, Messages.get(this, "rage")); state = HUNTING; } else { state = WANDERING; @@ -1212,7 +1212,7 @@ public abstract class Mob extends Char { && buffs( AllyBuff.class ).isEmpty() && buff( Dread.class ) == null) { if (enemySeen) { - sprite.showStatus(CharSprite.NEGATIVE, Messages.get(Mob.class, "rage")); + sprite.showStatus(CharSprite.WARNING, Messages.get(Mob.class, "rage")); state = HUNTING; } else { state = WANDERING; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index a618fd1d2..67a94812a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -613,11 +613,11 @@ public class Tengu extends Mob { PointF p = DungeonTilemap.raisedTileCenterToWorld(bombPos); if (timer == 3) { - FloatingText.show(p.x, p.y, bombPos, "3...", CharSprite.NEUTRAL); + FloatingText.show(p.x, p.y, bombPos, "3...", CharSprite.WARNING); } else if (timer == 2){ FloatingText.show(p.x, p.y, bombPos, "2...", CharSprite.WARNING); } else if (timer == 1){ - FloatingText.show(p.x, p.y, bombPos, "1...", CharSprite.NEGATIVE); + FloatingText.show(p.x, p.y, bombPos, "1...", CharSprite.WARNING); } else { PathFinder.buildDistanceMap( bombPos, BArray.not( Dungeon.level.solid, null ), 2 ); for (int cell = 0; cell < PathFinder.distance.length; cell++) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java index a39bcbd19..575f1793b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java @@ -57,7 +57,7 @@ public class Explosive extends Weapon.Enchantment { attacker.sprite.emitter().burst(SmokeParticle.FACTORY, 4); Item.updateQuickslot(); } else if (currentDurability > 10 && durability <= 10){ - attacker.sprite.showStatus(CharSprite.NEGATIVE, Messages.get(this, "hot")); + attacker.sprite.showStatus(CharSprite.WARNING, Messages.get(this, "hot")); GLog.n(Messages.get(this, "desc_hot")); attacker.sprite.emitter().burst(BlastParticle.FACTORY, 5); Item.updateQuickslot();