v2.3.0: adjusted use of orange and red in floating text:
- orange is now used for all cases of warning/negative text - red is now used in all cases of damage and death effects
This commit is contained in:
@@ -746,7 +746,7 @@ public abstract class Char extends Actor {
|
|||||||
b.announced = false;
|
b.announced = false;
|
||||||
b.set(dmg*buff(Sickle.HarvestBleedTracker.class).bleedFactor, Sickle.HarvestBleedTracker.class);
|
b.set(dmg*buff(Sickle.HarvestBleedTracker.class).bleedFactor, Sickle.HarvestBleedTracker.class);
|
||||||
b.attachTo(this);
|
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();
|
buff(Sickle.HarvestBleedTracker.class).detach();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -825,11 +825,7 @@ public abstract class Char extends Actor {
|
|||||||
if (src instanceof Corruption) icon = FloatingText.CORRUPTION;
|
if (src instanceof Corruption) icon = FloatingText.CORRUPTION;
|
||||||
if (src instanceof AscensionChallenge) icon = FloatingText.AMULET;
|
if (src instanceof AscensionChallenge) icon = FloatingText.AMULET;
|
||||||
|
|
||||||
sprite.showStatusWithIcon(HP > HT / 2 ?
|
sprite.showStatusWithIcon(CharSprite.NEGATIVE, Integer.toString(dmg + shielded), icon);
|
||||||
CharSprite.WARNING :
|
|
||||||
CharSprite.NEGATIVE,
|
|
||||||
Integer.toString(dmg + shielded),
|
|
||||||
icon);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HP < 0) HP = 0;
|
if (HP < 0) HP = 0;
|
||||||
@@ -995,7 +991,7 @@ public abstract class Char extends Actor {
|
|||||||
sprite.showStatus(CharSprite.POSITIVE, Messages.titleCase(buff.name()));
|
sprite.showStatus(CharSprite.POSITIVE, Messages.titleCase(buff.name()));
|
||||||
break;
|
break;
|
||||||
case NEGATIVE:
|
case NEGATIVE:
|
||||||
sprite.showStatus(CharSprite.NEGATIVE, Messages.titleCase(buff.name()));
|
sprite.showStatus(CharSprite.WARNING, Messages.titleCase(buff.name()));
|
||||||
break;
|
break;
|
||||||
case NEUTRAL:
|
case NEUTRAL:
|
||||||
default:
|
default:
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ public class ArmoredBrute extends Brute {
|
|||||||
Buff.affect(this, ArmoredRage.class).setShield(HT/2 + 1);
|
Buff.affect(this, ArmoredRage.class).setShield(HT/2 + 1);
|
||||||
sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(HT/2 + 1), FloatingText.SHIELDING );
|
sprite.showStatusWithIcon( CharSprite.POSITIVE, Integer.toString(HT/2 + 1), FloatingText.SHIELDING );
|
||||||
if (Dungeon.level.heroFOV[pos]) {
|
if (Dungeon.level.heroFOV[pos]) {
|
||||||
sprite.showStatus( CharSprite.NEGATIVE, Messages.get(this, "enraged") );
|
sprite.showStatus( CharSprite.WARNING, Messages.get(this, "enraged") );
|
||||||
}
|
}
|
||||||
spend( TICK );
|
spend( TICK );
|
||||||
hasRaged = true;
|
hasRaged = true;
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ public class Goo extends Mob {
|
|||||||
((GooSprite)sprite).pumpUp( pumpedUp );
|
((GooSprite)sprite).pumpUp( pumpedUp );
|
||||||
|
|
||||||
if (Dungeon.level.heroFOV[pos]) {
|
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") );
|
GLog.n( Messages.get(this, "pumpup") );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ public class Goo extends Mob {
|
|||||||
super.damage(dmg, src);
|
super.damage(dmg, src);
|
||||||
if ((HP*2 <= HT) && !bleeding){
|
if ((HP*2 <= HT) && !bleeding){
|
||||||
BossHealthBar.bleed(true);
|
BossHealthBar.bleed(true);
|
||||||
sprite.showStatus(CharSprite.NEGATIVE, Messages.get(this, "enraged"));
|
sprite.showStatus(CharSprite.WARNING, Messages.get(this, "enraged"));
|
||||||
((GooSprite)sprite).spray(true);
|
((GooSprite)sprite).spray(true);
|
||||||
yell(Messages.get(this, "gluuurp"));
|
yell(Messages.get(this, "gluuurp"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -426,7 +426,7 @@ public abstract class Mob extends Char {
|
|||||||
if ((buff instanceof Terror && buff(Dread.class) == null)
|
if ((buff instanceof Terror && buff(Dread.class) == null)
|
||||||
|| (buff instanceof Dread && buff(Terror.class) == null)) {
|
|| (buff instanceof Dread && buff(Terror.class) == null)) {
|
||||||
if (enemySeen) {
|
if (enemySeen) {
|
||||||
sprite.showStatus(CharSprite.NEGATIVE, Messages.get(this, "rage"));
|
sprite.showStatus(CharSprite.WARNING, Messages.get(this, "rage"));
|
||||||
state = HUNTING;
|
state = HUNTING;
|
||||||
} else {
|
} else {
|
||||||
state = WANDERING;
|
state = WANDERING;
|
||||||
@@ -1212,7 +1212,7 @@ public abstract class Mob extends Char {
|
|||||||
&& buffs( AllyBuff.class ).isEmpty()
|
&& buffs( AllyBuff.class ).isEmpty()
|
||||||
&& buff( Dread.class ) == null) {
|
&& buff( Dread.class ) == null) {
|
||||||
if (enemySeen) {
|
if (enemySeen) {
|
||||||
sprite.showStatus(CharSprite.NEGATIVE, Messages.get(Mob.class, "rage"));
|
sprite.showStatus(CharSprite.WARNING, Messages.get(Mob.class, "rage"));
|
||||||
state = HUNTING;
|
state = HUNTING;
|
||||||
} else {
|
} else {
|
||||||
state = WANDERING;
|
state = WANDERING;
|
||||||
|
|||||||
@@ -613,11 +613,11 @@ public class Tengu extends Mob {
|
|||||||
|
|
||||||
PointF p = DungeonTilemap.raisedTileCenterToWorld(bombPos);
|
PointF p = DungeonTilemap.raisedTileCenterToWorld(bombPos);
|
||||||
if (timer == 3) {
|
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){
|
} else if (timer == 2){
|
||||||
FloatingText.show(p.x, p.y, bombPos, "2...", CharSprite.WARNING);
|
FloatingText.show(p.x, p.y, bombPos, "2...", CharSprite.WARNING);
|
||||||
} else if (timer == 1){
|
} 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 {
|
} else {
|
||||||
PathFinder.buildDistanceMap( bombPos, BArray.not( Dungeon.level.solid, null ), 2 );
|
PathFinder.buildDistanceMap( bombPos, BArray.not( Dungeon.level.solid, null ), 2 );
|
||||||
for (int cell = 0; cell < PathFinder.distance.length; cell++) {
|
for (int cell = 0; cell < PathFinder.distance.length; cell++) {
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ public class Explosive extends Weapon.Enchantment {
|
|||||||
attacker.sprite.emitter().burst(SmokeParticle.FACTORY, 4);
|
attacker.sprite.emitter().burst(SmokeParticle.FACTORY, 4);
|
||||||
Item.updateQuickslot();
|
Item.updateQuickslot();
|
||||||
} else if (currentDurability > 10 && durability <= 10){
|
} 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"));
|
GLog.n(Messages.get(this, "desc_hot"));
|
||||||
attacker.sprite.emitter().burst(BlastParticle.FACTORY, 5);
|
attacker.sprite.emitter().burst(BlastParticle.FACTORY, 5);
|
||||||
Item.updateQuickslot();
|
Item.updateQuickslot();
|
||||||
|
|||||||
Reference in New Issue
Block a user