From 59628e5f29e41047aa5bce8f40d65b546e5c9ac7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 14 May 2016 22:46:20 -0400 Subject: [PATCH] v0.4.0: refactored weapons with changed stats to use none-constant values --- .../shatteredpixeldungeon/items/weapon/melee/BattleAxe.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Dagger.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Glaive.java | 6 +++--- .../shatteredpixeldungeon/items/weapon/melee/Knuckles.java | 4 ++-- .../shatteredpixeldungeon/items/weapon/melee/Mace.java | 2 +- .../items/weapon/melee/MagesStaff.java | 2 +- .../items/weapon/melee/Quarterstaff.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Spear.java | 6 +++--- .../shatteredpixeldungeon/items/weapon/melee/WarHammer.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java index b93074ac1..65ac215ee 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java +++ b/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 } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java index e04d02b3a..c21dab545 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java +++ b/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 } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java index 2bef86b23..af1f9d118 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java +++ b/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 - lvl*8; //+8 per level, up from +6 + return Math.round(6.67f*(tier+1)) + //40 base, up from 30 + lvl*Math.round(1.33f*(tier+1)); //+8 per level, up from +6 } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java index 7e20dd64d..620d43dce 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java +++ b/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 - lvl*2; //+1 per level, down from +2 + return 3*(tier+1) + //6 base, down from 10 + lvl; //+1 per level, down from +2 } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java index 64e730e0c..87f9e83e5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java +++ b/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 } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index d6d9606a7..2a044bdad 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/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 } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java index 984eb824d..9c0bb4589 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java +++ b/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 } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java index 7f27d07c0..450758b5f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java +++ b/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 - lvl*4; //+4 per level, up from +3 + return Math.round(6.67f*(tier+1)) + //20 base, up from 15 + lvl*Math.round(1.33f*(tier+1)); //+4 per level, up from +3 } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java index fc96fc376..fdc208f3f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java +++ b/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 }