From ca1fef8f926cf29a4116a0c56e60d0c2e86dd4f7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 22 Jul 2016 18:08:29 -0400 Subject: [PATCH] v0.4.1: fixed some errors in defense logic --- .../shatteredpixeldungeon/actors/hero/Hero.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/Statue.java | 2 +- .../shatteredpixeldungeon/items/KindOfWeapon.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Greatshield.java | 2 +- .../items/weapon/melee/Quarterstaff.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/RoundShield.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Sai.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index ef59057bf..af7dd4565 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -308,8 +308,8 @@ public class Hero extends Char { dr = Math.max(dr, 0); } } - if (belongings.weapon != null) dr += Math.max( belongings.weapon.defenceFactor( this ), 0 ); - if (bark != null) dr += bark.level(); + if (belongings.weapon != null) dr += Random.NormalIntRange( 0 , belongings.weapon.defenseFactor( this ) ); + if (bark != null) dr += Random.NormalIntRange( 0 , bark.level() ); return dr; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java index 4cfab09d1..d2a274b43 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java @@ -108,7 +108,7 @@ public class Statue extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, Dungeon.depth + weapon.defenceFactor(null)); + return Random.NormalIntRange(0, Dungeon.depth + weapon.defenseFactor(null)); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java index d60d33265..e79eb4266 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java @@ -104,7 +104,7 @@ abstract public class KindOfWeapon extends EquipableItem { return 1; } - public int defenceFactor( Hero hero ) { + public int defenseFactor(Hero hero ) { return 0; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java index 38fc6956e..f9e9ae03e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java @@ -38,7 +38,7 @@ public class Greatshield extends MeleeWeapon { } @Override - public int defenceFactor(Hero hero) { + public int defenseFactor(Hero hero) { 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 b3779d869..8a26369b1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java @@ -38,7 +38,7 @@ public class Quarterstaff extends MeleeWeapon { } @Override - public int defenceFactor(Hero hero) { + public int defenseFactor(Hero hero) { 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 b709cb89a..0599e03e4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java @@ -38,7 +38,7 @@ public class RoundShield extends MeleeWeapon { } @Override - public int defenceFactor(Hero hero) { + public int defenseFactor(Hero hero) { 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 2db7897f9..bc93bcac6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java @@ -39,7 +39,7 @@ public class Sai extends MeleeWeapon { } @Override - public int defenceFactor(Hero hero) { + public int defenseFactor(Hero hero) { return 3; //3 extra defence } }