diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java b/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java index 9f884fc16..10ef17e7b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java @@ -19,16 +19,17 @@ package com.shatteredpixel.shatteredpixeldungeon; public class ResultDescriptions { - // Mobs - public static final String MOB = "Killed by %s on level %d"; - public static final String BOSS = "Killed by the %s on level %d"; + // Mobs + public static final String MOB = "Killed by a %s on level %d"; + public static final String UNIQUE = "Killed by the %s on level %d"; + public static final String NAMED = "Killed by %s on level %d"; // Items - public static final String ITEM = "Killed by your own %s on level %d"; + public static final String ITEM = "Killed by your own %s on level %d"; public static final String GLYPH = "Killed by the %s on level %d"; // Dungeon features - public static final String TRAP = "Killed by discharge of %s on level %d"; + public static final String TRAP = "Killed by a %s on level %d"; // Debuffs & blobs public static final String BURNING = "Burned to death on level %d"; @@ -36,7 +37,7 @@ public class ResultDescriptions { public static final String POISON = "Died from poison on level %d"; public static final String GAS = "Died from toxic gas on level %d"; public static final String BLEEDING = "Bled to death on level %d"; - public static final String OOZE = "Killed by a caustic ooze on level %d"; + public static final String OOZE = "Corroded to death on level %d"; public static final String FALL = "Fell to death on level %d"; public static final String WIN = "Obtained the Amulet of Yendor"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index da8ef6407..97846e22f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.*; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Yog; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; @@ -157,8 +158,10 @@ public abstract class Char extends Actor { GLog.n( TXT_KILL, Dungeon.hero.killerGlyph.name() ); } else { - if (Bestiary.isUnique( this )) { - Dungeon.fail( Utils.format( ResultDescriptions.BOSS, name, Dungeon.depth ) ); + if ( this instanceof Yog ) { + Dungeon.fail( Utils.format( ResultDescriptions.NAMED, name, Dungeon.depth ) ); + } if (Bestiary.isUnique( this )) { + Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name, Dungeon.depth ) ); } else { Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ), Dungeon.depth ) ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java index 59843c853..0ae673790 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java @@ -179,7 +179,8 @@ public class Bestiary { } public static boolean isUnique( Char mob ) { - return mob instanceof Goo || mob instanceof Tengu || mob instanceof DM300 || mob instanceof King || mob instanceof Yog + return mob instanceof Goo || mob instanceof Tengu || mob instanceof DM300 || mob instanceof King + || mob instanceof Yog.BurningFist || mob instanceof Yog.RottingFist || mob instanceof Ghost.FetidRat || mob instanceof Ghost.GnollTrickster || mob instanceof Ghost.GreatCrab; } }