Merging 1.9.1 source: item changes

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java

@@ -31,7 +31,7 @@ import com.watabou.utils.Random;
 
 public class Death extends Weapon.Enchantment {
 
-	private static final String TXT_GRIM	= "Grim %s";
+	private static final String TXT_GRIM	= "grim %s";
 	
 	private static ItemSprite.Glowing BLACK = new ItemSprite.Glowing( 0x000000 );
 	
@@ -40,7 +40,7 @@ public class Death extends Weapon.Enchantment {
 		// lvl 0 - 8%
 		// lvl 1 ~ 9%
 		// lvl 2 ~ 10%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 100 ) >= 92) {
 			

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java

@@ -31,7 +31,7 @@ import com.watabou.utils.Random;
 
 public class Fire extends Weapon.Enchantment {
 
-	private static final String TXT_BLAZING	= "Blazing %s";
+	private static final String TXT_BLAZING	= "blazing %s";
 	
 	private static ItemSprite.Glowing ORANGE = new ItemSprite.Glowing( 0xFF4400 );
 	
@@ -40,7 +40,7 @@ public class Fire extends Weapon.Enchantment {
 		// lvl 0 - 33%
 		// lvl 1 - 50%
 		// lvl 2 - 60%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 3 ) >= 2) {
 			

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java

@@ -32,7 +32,7 @@ import com.watabou.utils.Random;
 
 public class Horror extends Weapon.Enchantment {
 
-	private static final String TXT_ELDRITCH	= "Eldritch %s";
+	private static final String TXT_ELDRITCH	= "eldritch %s";
 	
 	private static ItemSprite.Glowing GREY = new ItemSprite.Glowing( 0x222222 );
 	
@@ -41,7 +41,7 @@ public class Horror extends Weapon.Enchantment {
 		// lvl 0 - 20%
 		// lvl 1 - 33%
 		// lvl 2 - 43%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 5 ) >= 4) {
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java

@@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
 
 public class Instability extends Weapon.Enchantment {
 
-	private static final String TXT_UNSTABLE	= "Unstable %s";
+	private static final String TXT_UNSTABLE	= "unstable %s";
 	
 	@Override
 	public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java

@@ -30,14 +30,14 @@ import com.watabou.utils.Random;
 
 public class Leech extends Weapon.Enchantment {
 
-	private static final String TXT_VAMPIRIC	= "Vampiric %s";
+	private static final String TXT_VAMPIRIC	= "vampiric %s";
 	
 	private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0x660022 );
 	
 	@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() );
 		
 		// lvl 0 - 33%
 		// lvl 1 - 43%

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java

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

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java

@@ -29,7 +29,7 @@ import com.watabou.utils.Random;
 
 public class Paralysis extends Weapon.Enchantment {
 
-	private static final String TXT_STUNNING = "Stunning %s";
+	private static final String TXT_STUNNING = "stunning %s";
 	
 	private static ItemSprite.Glowing YELLOW = new ItemSprite.Glowing( 0xCCAA44 );
 	
@@ -38,7 +38,7 @@ public class Paralysis extends Weapon.Enchantment {
 		// lvl 0 - 13%
 		// lvl 1 - 22%
 		// lvl 2 - 30%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 8 ) >= 7) {
 			

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java

@@ -29,7 +29,7 @@ import com.watabou.utils.Random;
 
 public class Poison extends Weapon.Enchantment {
 
-	private static final String TXT_VENOMOUS	= "Venomous %s";
+	private static final String TXT_VENOMOUS	= "venomous %s";
 	
 	private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x4400AA );
 	
@@ -38,7 +38,7 @@ public class Poison extends Weapon.Enchantment {
 		// lvl 0 - 33%
 		// lvl 1 - 50%
 		// lvl 2 - 60%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 3 ) >= 2) {
 			

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java

@@ -34,14 +34,14 @@ import com.watabou.utils.Random;
 
 public class Shock extends Weapon.Enchantment {
 
-	private static final String TXT_SHOCKING	= "Shocking %s";
+	private static final String TXT_SHOCKING	= "shocking %s";
 	
 	@Override
 	public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
 		// lvl 0 - 25%
 		// lvl 1 - 40%
 		// lvl 2 - 50%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 4 ) >= 3) {
 			

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java

@@ -30,7 +30,7 @@ import com.watabou.utils.Random;
 
 public class Slow extends Weapon.Enchantment {
 
-	private static final String TXT_CHILLING = "Chilling %s";
+	private static final String TXT_CHILLING = "chilling %s";
 	
 	private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x0044FF );
 	
@@ -39,7 +39,7 @@ public class Slow extends Weapon.Enchantment {
 		// lvl 0 - 25%
 		// lvl 1 - 40%
 		// lvl 2 - 50%
-		int level = Math.max( 0, weapon.level );
+		int level = Math.max( 0, weapon.level() );
 		
 		if (Random.Int( level + 4 ) >= 3) {