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
@@ -30,7 +30,6 @@ public class MasterThievesArmband extends Artifact {
name = "Master Thieves' Armband";
image = ItemSpriteSheet.ARTIFACT_ARMBAND;
level = 0;
levelCap = 10;
charge = 0;
@@ -84,7 +83,7 @@ public class MasterThievesArmband extends Artifact {
exp += value;
}
}
while(exp >= 600 && level < levelCap) {
while(exp >= 600 && level() < levelCap) {
exp -= 600;
upgrade();
}
@@ -93,7 +92,7 @@ public class MasterThievesArmband extends Artifact {
public float stealChance(int value){
//get lvl*100 gold or lvl*5% item value of free charge, whichever is less.
int chargeBonus = Math.min(level*100, (value*level)/20);
int chargeBonus = Math.min(level()*100, (value*level())/20);
return (((float)charge + chargeBonus)/value);
}