v0.4.0: refactored weapons with changed stats to use none-constant values

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java

@@ -33,7 +33,7 @@ public class BattleAxe extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  20 +            //20 base, down from 25
+		return  4*(tier+1) +    //20 base, down from 25
 				lvl*(tier+1);   //scaling unchanged
 	}
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java

@@ -33,7 +33,7 @@ public class Dagger extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  8 +             //8 base, down from 10
+		return  4*(tier+1) +    //8 base, down from 10
 				lvl*(tier+1);   //scaling unchanged
 	}
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java

@@ -40,13 +40,13 @@ public class Glaive extends MeleeWeapon {
 	@Override
 	public int min(int lvl) {
 		return  tier +  //base unchanged
-				2*lvl;  //+2 per level, up from +1
+				lvl*2;  //+2 per level, up from +1
 	}
 
 	@Override
 	public int max(int lvl) {
-		return  40 +    //40 base, up from 30
+		return  Math.round(6.67f*(tier+1)) +    //40 base, up from 30
-				lvl*8;  //+8 per level, up from +6
+				lvl*Math.round(1.33f*(tier+1)); //+8 per level, up from +6
 	}
 
 }

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java

@@ -33,8 +33,8 @@ public class Knuckles extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  6 +     //6 base, down from 10
+		return  3*(tier+1) +    //6 base, down from 10
-				lvl*2;  //+1 per level, down from +2
+				lvl;            //+1 per level, down from +2
 	}
 
 }

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java

@@ -33,7 +33,7 @@ public class Mace extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  16 +            //16 base, down from 20
+		return  4*(tier+1) +    //16 base, down from 20
 				lvl*(tier+1);   //scaling unchanged
 	}
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java

@@ -76,7 +76,7 @@ public class MagesStaff extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  6 +             //6 base damage, down from 10
+		return  3*(tier+1) +    //6 base damage, down from 10
 				lvl*(tier+1);   //scaling unaffected
 	}
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java

@@ -32,7 +32,7 @@ public class Quarterstaff extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  12 +            //12 base, down from 15
+		return  4*(tier+1) +    //12 base, down from 15
 				lvl*(tier+1);   //scaling unchanged
 	}
 

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java

@@ -40,13 +40,13 @@ public class Spear extends MeleeWeapon {
 	@Override
 	public int min(int lvl) {
 		return  tier +  //base unchanged
-				2*lvl;  //+2 per level, up from +1
+				lvl*2;  //+2 per level, up from +1
 	}
 
 	@Override
 	public int max(int lvl) {
-		return  20 +    //20 base, up from 15
+		return  Math.round(6.67f*(tier+1)) +    //20 base, up from 15
-				lvl*4;  //+4 per level, up from +3
+				lvl*Math.round(1.33f*(tier+1)); //+4 per level, up from +3
 	}
 
 }

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java

@@ -33,7 +33,7 @@ public class WarHammer extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  24 +            //24 base, down from 30
+		return  4*(tier+1) +    //24 base, down from 30
 				lvl*(tier+1);   //scaling unchanged
 	}