diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java index 626f4feb7..38fc6956e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java @@ -34,11 +34,11 @@ public class Greatshield extends MeleeWeapon { @Override public int max(int lvl) { return 2*(tier+1) + //12 base, down from 30 - lvl*(tier+1); //scaling unchanged + lvl*(tier-2); //+3 per level, down from +6 } @Override public int defenceFactor(Hero hero) { - return 10+2*level(); //10 extra defence, plus 3 per level; + return 10+3*level(); //10 extra defence, plus 3 per level; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java index cc9a8aa46..b3779d869 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java @@ -39,6 +39,6 @@ public class Quarterstaff extends MeleeWeapon { @Override public int defenceFactor(Hero hero) { - return 2+level(); //2 extra defence, plus 1 per level; + return 2; //2 extra defence } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java index 03c86e07d..b709cb89a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java @@ -34,11 +34,11 @@ public class RoundShield extends MeleeWeapon { @Override public int max(int lvl) { return 3*(tier+1) + //12 base, down from 20 - lvl*(tier+1); //scaling unchanged + lvl*(tier-1); //+2 per level, down from +4 } @Override public int defenceFactor(Hero hero) { - return 6+2*level(); //6 extra defence, plus 2 per level; + return 5+2*level(); //5 extra defence, plus 2 per level; } } \ No newline at end of file diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java index a2d40f682..2db7897f9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java @@ -40,6 +40,6 @@ public class Sai extends MeleeWeapon { @Override public int defenceFactor(Hero hero) { - return 3+level(); //3 extra defence, plus 1 per level; + return 3; //3 extra defence } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 067be6f5e..222a869fe 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -793,7 +793,7 @@ items.weapon.melee.greataxe.stats_desc=This weapon is incredibly heavy. items.weapon.melee.greataxe.desc=Meant to be wielded over the shoulder, this titanic axe is a powerful as it is heavy. items.weapon.melee.greatshield.name=greatshield -items.weapon.melee.greatshield.stats_desc=This weapon blocks a tremendous amount of damage. +items.weapon.melee.greatshield.stats_desc=This weapon blocks a tremendous amount of damage, which scales with upgrades. items.weapon.melee.greatshield.desc=More like a mobile wall than a shield, this gigantic mass of metal aids defense, but doesn't leave much room for attacking. items.weapon.melee.greatsword.name=greatsword @@ -841,7 +841,7 @@ items.weapon.melee.quarterstaff.stats_desc=This weapon blocks some damage. items.weapon.melee.quarterstaff.desc=A staff of hardwood, its ends are shod with iron. items.weapon.melee.roundshield.name=round shield -items.weapon.melee.roundshield.stats_desc=This weapon blocks a significant amount of damage. +items.weapon.melee.roundshield.stats_desc=This weapon blocks a significant amount of damage, which scales with upgrades. items.weapon.melee.roundshield.desc=This large shield effectively blocks attacks and makes a decent weapon in a pinch. items.weapon.melee.runicblade.name=runic blade