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