Merging 1.9.1 source: actor changes (minus questgivers, they will be done separately)

This commit is contained in:
Evan Debenham
2015-11-10 04:12:06 -05:00
parent 83d492440e
commit 3fdd6452db
9 changed files with 34 additions and 31 deletions
@@ -428,13 +428,18 @@ public abstract class Mob extends Char {
}
Badges.validateNightHunter();
}
if (Dungeon.hero.lvl <= maxLvl && EXP > 0) {
Dungeon.hero.sprite.showStatus( CharSprite.POSITIVE, TXT_EXP, EXP );
Dungeon.hero.earnExp( EXP );
int exp = exp();
if (exp > 0) {
Dungeon.hero.sprite.showStatus( CharSprite.POSITIVE, TXT_EXP, exp );
Dungeon.hero.earnExp( exp );
}
}
}
public int exp() {
return Dungeon.hero.lvl <= maxLvl ? EXP : 0;
}
@Override
public void die( Object cause ) {