v0.3.4: reworked rankings to store their cause instead of a result string
This commit is contained in:
committed by
Evan Debenham
parent
0e2fbc05fb
commit
ac967fad27
@@ -149,7 +149,7 @@ public class Bomb extends Item {
|
||||
}
|
||||
|
||||
if (ch == Dungeon.hero && !ch.isAlive())
|
||||
Dungeon.fail( Messages.get(this, "ondeath") );
|
||||
Dungeon.fail( getClass() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ public class Armor extends EquipableItem {
|
||||
if (inscribe) {
|
||||
inscribe( Glyph.random() );
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
STR--;
|
||||
|
||||
@@ -339,7 +339,7 @@ public class Armor extends EquipableItem {
|
||||
public boolean checkOwner( Char owner ) {
|
||||
if (!owner.isAlive() && owner instanceof Hero) {
|
||||
|
||||
Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, name() ) );
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.get(this, "killed", name()) );
|
||||
|
||||
Badges.validateDeathFromGlyph();
|
||||
|
||||
@@ -104,7 +104,7 @@ public class Viscosity extends Glyph {
|
||||
|
||||
public void prolong( int damage ) {
|
||||
this.damage += damage;
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public int icon() {
|
||||
@@ -124,7 +124,7 @@ public class Viscosity extends Glyph {
|
||||
if (target == Dungeon.hero && !target.isAlive()) {
|
||||
|
||||
Glyph glyph = new Viscosity();
|
||||
Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, glyph.name() ) );
|
||||
Dungeon.fail( glyph.getClass() );
|
||||
GLog.n( Messages.get(Glyph.class, "killed", glyph.name()) );
|
||||
|
||||
Badges.validateDeathFromGlyph();
|
||||
|
||||
@@ -74,7 +74,7 @@ public class ChaliceOfBlood extends Artifact {
|
||||
protected void onSelect(int index) {
|
||||
if (index == 0)
|
||||
prick(Dungeon.hero);
|
||||
};
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
@@ -108,7 +108,7 @@ public class ChaliceOfBlood extends Artifact {
|
||||
hero.damage(damage, this);
|
||||
|
||||
if (!hero.isAlive()) {
|
||||
Dungeon.fail(Utils.format( ResultDescriptions.ITEM, name ));
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.get(this, "ondeath") );
|
||||
} else {
|
||||
upgrade();
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ public class ScrollOfPsionicBlast extends Scroll {
|
||||
curUser.spendAndNext( TIME_TO_READ ); //no animation here, the flash interrupts it anyway.
|
||||
|
||||
if (!curUser.isAlive()) {
|
||||
Dungeon.fail( Utils.format(ResultDescriptions.ITEM, name ));
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.get(this, "ondeath") );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@ public class CursedWand {
|
||||
target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 3);
|
||||
Sample.INSTANCE.play(Assets.SND_CURSED);
|
||||
if (!user.isAlive()) {
|
||||
Dungeon.fail(Utils.format(ResultDescriptions.ITEM, wand.name()));
|
||||
Dungeon.fail( wand.getClass() );
|
||||
GLog.n(Messages.get(CursedWand.class, "ondeath", wand.name()));
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -100,7 +100,7 @@ public class WandOfBlastWave extends Wand {
|
||||
}
|
||||
|
||||
if (!curUser.isAlive()) {
|
||||
Dungeon.fail( Utils.format(ResultDescriptions.ITEM, name) );
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.get( this, "ondeath") );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ public class WandOfLightning extends Wand {
|
||||
}
|
||||
|
||||
if (!curUser.isAlive()) {
|
||||
Dungeon.fail( Utils.format( ResultDescriptions.ITEM, name ) );
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n(Messages.get(this, "ondeath"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,7 +173,6 @@ public class WandOfTransfusion extends Wand {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//this wand costs health too
|
||||
private void damageHero(){
|
||||
// 15% of max hp
|
||||
@@ -181,7 +180,7 @@ public class WandOfTransfusion extends Wand {
|
||||
curUser.damage(damage, this);
|
||||
|
||||
if (!curUser.isAlive()){
|
||||
Dungeon.fail( Utils.format(ResultDescriptions.ITEM, name) );
|
||||
Dungeon.fail( getClass() );
|
||||
GLog.n( Messages.get(this, "ondeath") );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user