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

src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java

@@ -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 ) {

src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java

@@ -91,7 +91,7 @@ public class Skeleton extends Mob {
 		Item loot = Generator.random( Generator.Category.WEAPON );
 		for (int i=0; i < 2; i++) {
 			Item l = Generator.random( Generator.Category.WEAPON );
-			if (l.level < loot.level) {
+			if (l.level() < loot.level()) {
 				loot = l;
 			}
 		}

src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java

@@ -55,7 +55,7 @@ public class Statue extends Mob {
 		
 		do {
 			weapon = (Weapon)Generator.random( Generator.Category.WEAPON );
-		} while (!(weapon instanceof MeleeWeapon) || weapon.level < 0);
+		} while (!(weapon instanceof MeleeWeapon) || weapon.level() < 0);
 		
 		weapon.identify();
 		weapon.enchant( Enchantment.random() );
@@ -88,7 +88,7 @@ public class Statue extends Mob {
 	
 	@Override
 	public int damageRoll() {
-		return Random.NormalIntRange( weapon.MIN, weapon.MAX );
+		return Random.NormalIntRange( weapon.min(), weapon.max() );
 	}
 	
 	@Override

src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java

@@ -183,7 +183,7 @@ public class Blacksmith extends NPC {
 			return "I don't work with cursed items!";
 		}
 		
-		if (item1.level < 0 || item2.level < 0) {
+		if (item1.level() < 0 || item2.level() < 0) {
 			return "It's a junk, the quality is too poor!";
 		}
 		
@@ -197,7 +197,7 @@ public class Blacksmith extends NPC {
 	public static void upgrade( Item item1, Item item2 ) {
 		
 		Item first, second;
-		if (item2.level > item1.level) {
+		if (item2.level() > item1.level()) {
 			first = item2;
 			second = item1;
 		} else {