LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3: more result description corrections

Browse Source
This commit is contained in:
Evan Debenham 2014-12-16 17:01:08 -05:00
parent cfb711b11d
commit 0dcdb66fad
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/shatteredpixel/shatteredpixeldungeon/ResultDescriptions.java
View File

@ -20,15 +20,16 @@ package com.shatteredpixel.shatteredpixeldungeon;
public class ResultDescriptions { public class ResultDescriptions {
// Mobs // Mobs
public static final String MOB = "Killed by %s on level %d"; public static final String MOB = "Killed by a %s on level %d";
public static final String BOSS = "Killed by the %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 // 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"; public static final String GLYPH = "Killed by the %s on level %d";
// Dungeon features // 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 // Debuffs & blobs
public static final String BURNING = "Burned to death on level %d"; 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 POISON = "Died from poison on level %d";
public static final String GAS = "Died from toxic gas 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 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 FALL = "Fell to death on level %d";
public static final String WIN = "Obtained the Amulet of Yendor"; public static final String WIN = "Obtained the Amulet of Yendor";

7
src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.*;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary; 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.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PoisonParticle;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CloakOfShadows; 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() ); GLog.n( TXT_KILL, Dungeon.hero.killerGlyph.name() );
} else { } else {
if (Bestiary.isUnique( this )) { if ( this instanceof Yog ) {
Dungeon.fail( Utils.format( ResultDescriptions.BOSS, name, Dungeon.depth ) ); Dungeon.fail( Utils.format( ResultDescriptions.NAMED, name, Dungeon.depth ) );
} if (Bestiary.isUnique( this )) {
Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name, Dungeon.depth ) );
} else { } else {
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Dungeon.fail( Utils.format( ResultDescriptions.MOB,
Utils.indefinite( name ), Dungeon.depth ) ); Utils.indefinite( name ), Dungeon.depth ) );

3
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java
View File

@ -179,7 +179,8 @@ public class Bestiary {
} }
public static boolean isUnique( Char mob ) { 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; || mob instanceof Ghost.FetidRat || mob instanceof Ghost.GnollTrickster || mob instanceof Ghost.GreatCrab;
} }
} }