konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.3: improvements to the rankings page

Browse Source
This commit is contained in:
Evan Debenham
2015-01-03 21:55:40 -05:00
parent 0db40dbf87
commit 872199b43e
26 changed files with 115 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+3 -4
View File
@@ -159,12 +159,11 @@ public abstract class Char extends Actor {
} else {
if ( this instanceof Yog ) {
Dungeon.fail( Utils.format( ResultDescriptions.NAMED, name, Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.NAMED, name) );
} if (Bestiary.isUnique( this )) {
Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name, Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name) );
} else {
Dungeon.fail( Utils.format( ResultDescriptions.MOB,
Utils.indefinite( name ), Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name )) );
}
GLog.n( TXT_KILL, name );
src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class ToxicGas extends Blob implements Hero.Doom {
Badges.validateDeathFromGas();
Dungeon.fail( Utils.format( ResultDescriptions.GAS, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.GAS );
GLog.n( "You died from a toxic gas.." );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class Bleeding extends Buff {
}
if (target == Dungeon.hero && !target.isAlive()) {
Dungeon.fail( Utils.format( ResultDescriptions.BLEEDING, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.BLEEDING );
GLog.n( "You bled to death..." );
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class Burning extends Buff implements Hero.Doom {
Badges.validateDeathFromFire();
Dungeon.fail( Utils.format( ResultDescriptions.BURNING, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.BURNING );
GLog.n( TXT_BURNED_TO_DEATH );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class Hunger extends Buff implements Hero.Doom {
Badges.validateDeathFromHunger();
Dungeon.fail( Utils.format( ResultDescriptions.HUNGER, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.HUNGER );
GLog.n( TXT_DEATH );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class Ooze extends Buff {
else if (Random.Int(2) == 0)
target.damage( 1, this );
if (!target.isAlive() && target == Dungeon.hero) {
Dungeon.fail( Utils.format( ResultDescriptions.OOZE, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.OOZE );
GLog.n( TXT_HERO_KILLED, toString() );
}
spend( TICK );
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class Poison extends Buff implements Hero.Doom {
public void onDeath() {
Badges.validateDeathFromPoison();
Dungeon.fail( Utils.format( ResultDescriptions.POISON, Dungeon.depth ) );
Dungeon.fail( ResultDescriptions.POISON );
GLog.n( "You died from poison..." );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class Eye extends Mob {
}
if (!ch.isAlive() && ch == Dungeon.hero) {
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ), Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ) ) );
GLog.n( TXT_DEATHGAZE_KILLED, name );
}
} else {
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java
+1 -2
View File
@@ -106,8 +106,7 @@ public class Shaman extends Mob implements Callback {
Camera.main.shake( 2, 0.3f );
if (!enemy.isAlive()) {
Dungeon.fail( Utils.format( ResultDescriptions.MOB,
Utils.indefinite( name ), Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ) ) );
GLog.n( TXT_LIGHTNING_KILLED, name );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class Skeleton extends Mob {
}
if (heroKilled) {
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ), Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ) ) );
GLog.n( TXT_HERO_KILLED );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java
+1 -2
View File
@@ -108,8 +108,7 @@ public class Warlock extends Mob implements Callback {
enemy.damage( dmg, this );
if (!enemy.isAlive() && enemy == Dungeon.hero) {
Dungeon.fail( Utils.format( ResultDescriptions.MOB,
Utils.indefinite( name ), Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.MOB, Utils.indefinite( name ) ) );
GLog.n( TXT_SHADOWBOLT_KILLED, name );
}
} else {
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java
+1 -1
View File
@@ -335,7 +335,7 @@ public class Yog extends Mob {
enemy.sprite.flash();
if (!enemy.isAlive() && enemy == Dungeon.hero) {
Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name, Dungeon.depth ) );
Dungeon.fail( Utils.format( ResultDescriptions.UNIQUE, name ) );
GLog.n( TXT_KILL, name );
}
return true;