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
@@ -27,13 +27,13 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
public class Luck extends Weapon.Enchantment {
private static final String TXT_LUCKY = "Lucky %s";
private static final String TXT_LUCKY = "lucky %s";
private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x00FF00 );
@Override
public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
int level = Math.max( 0, weapon.level );
int level = Math.max( 0, weapon.level() );
int dmg = damage;
for (int i=1; i <= level+1; i++) {