Merging 1.9.1 source: item changes

This commit is contained in:
Evan Debenham
2015-11-11 02:01:25 -05:00
parent bc1e3ee17a
commit 366dce1610
86 changed files with 409 additions and 352 deletions
@@ -34,16 +34,23 @@ public class Boomerang extends MissileWeapon {
image = ItemSpriteSheet.BOOMERANG;
STR = 10;
MIN = 1;
MAX = 5;
stackable = false;
unique = true;
bones = false;
}
@Override
public int min() {
return 1 + level();
}
@Override
public int max() {
return 5 + 2 * level();
}
@Override
public boolean isUpgradable() {
return true;
@@ -56,8 +63,6 @@ public class Boomerang extends MissileWeapon {
@Override
public Item upgrade( boolean enchant ) {
MIN += 1;
MAX += 2;
super.upgrade( enchant );
updateQuickslot();
@@ -67,8 +72,6 @@ public class Boomerang extends MissileWeapon {
@Override
public Item degrade() {
MIN -= 1;
MAX -= 2;
return super.degrade();
}