From 9c992a9c073ed1cd340782b2fe957519826c3778 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 19 Jul 2016 04:33:53 -0400 Subject: [PATCH] v0.4.1: second rebalance pass on armor and enemy damage --- .../shatteredpixeldungeon/actors/mobs/Bat.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Brute.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/Crab.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Elemental.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Gnoll.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Goo.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/Guard.java | 2 +- .../shatteredpixeldungeon/actors/mobs/King.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Monk.java | 2 +- .../shatteredpixeldungeon/actors/mobs/NewbornElemental.java | 6 ------ .../shatteredpixeldungeon/actors/mobs/RotLasher.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Shaman.java | 4 ++-- .../shatteredpixeldungeon/actors/mobs/Skeleton.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Spinner.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Swarm.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Tengu.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Thief.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Warlock.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Yog.java | 4 ++-- .../shatteredpixeldungeon/items/armor/Armor.java | 6 +----- 20 files changed, 23 insertions(+), 33 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java index bd5c122ec..8c75acdf5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java @@ -51,7 +51,7 @@ public class Bat extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 8, 15 ); + return Random.NormalIntRange( 5, 18 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java index abb96ccf3..27fe0b5c8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java @@ -59,8 +59,8 @@ public class Brute extends Mob { @Override public int damageRoll() { return enraged ? - Random.NormalIntRange( 20, 40 ) : - Random.NormalIntRange( 10, 20 ); + Random.NormalIntRange( 15, 45 ) : + Random.NormalIntRange( 6, 26 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java index 0677e1f58..e437ea5d8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Crab.java @@ -43,7 +43,7 @@ public class Crab extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 3, 6 ); + return Random.NormalIntRange( 1, 8 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index e7eeeb434..4152ae2c1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -56,7 +56,7 @@ public class Elemental extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 18, 24 ); + return Random.NormalIntRange( 16, 26 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java index 29c97f311..0278d4fa4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Gnoll.java @@ -42,7 +42,7 @@ public class Gnoll extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 2, 5 ); + return Random.NormalIntRange( 1, 6 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 4a6ff4a40..cd7ce9b7b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -70,8 +70,8 @@ public class Goo extends Mob { @Override public int damageRoll() { - int min = (HP*2 <= HT) ? 3 : 2; - int max = (HP*2 <= HT) ? 12 : 8; + int min = 1; + int max = (HP*2 <= HT) ? 15 : 10; if (pumpedUp > 0) { pumpedUp = 0; for (int i = 0; i < Level.NEIGHBOURS9DIST2.length; i++) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java index 22e133b87..66c0c9fc2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Guard.java @@ -60,7 +60,7 @@ public class Guard extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange(5, 10); + return Random.NormalIntRange(4, 12); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java index 3687dc69e..ea93e9b53 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java @@ -283,7 +283,7 @@ public class King extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 16, 20 ); + return Random.NormalIntRange( 15, 25 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java index 56476c115..094f95412 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Monk.java @@ -56,7 +56,7 @@ public class Monk extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 16, 20 ); + return Random.NormalIntRange( 12, 25 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewbornElemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewbornElemental.java index 41810a39d..dbf117523 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewbornElemental.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewbornElemental.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.items.quest.Embers; import com.shatteredpixel.shatteredpixeldungeon.sprites.NewbornElementalSprite; -import com.watabou.utils.Random; public class NewbornElemental extends Elemental { @@ -43,11 +42,6 @@ public class NewbornElemental extends Elemental { properties.add(Property.MINIBOSS); } - @Override - public int damageRoll() { - return Random.NormalIntRange(10, 15); - } - @Override public void add(Buff buff) { if (buff instanceof Frost || buff instanceof Chill) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java index 5f9742b41..aa67429f3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotLasher.java @@ -86,7 +86,7 @@ public class RotLasher extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange(6, 12); + return Random.NormalIntRange(8, 15); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java index e222dce92..9891d27c6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Shaman.java @@ -56,7 +56,7 @@ public class Shaman extends Mob implements Callback { @Override public int damageRoll() { - return Random.NormalIntRange( 4, 6 ); + return Random.NormalIntRange( 2, 8 ); } @Override @@ -91,7 +91,7 @@ public class Shaman extends Mob implements Callback { spend( TIME_TO_ZAP ); if (hit( this, enemy, true )) { - int dmg = (int)(damageRoll()*1.5f); + int dmg = Random.NormalIntRange(3, 10); if (Level.water[enemy.pos] && !enemy.flying) { dmg *= 1.5f; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java index 4c179be09..4a69f272b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java @@ -57,7 +57,7 @@ public class Skeleton extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 3, 8 ); + return Random.NormalIntRange( 2, 10 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java index 4835f19c4..3af630fdd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java @@ -53,7 +53,7 @@ public class Spinner extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange(14, 18); + return Random.NormalIntRange(10, 25); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java index f7a162646..ee8205395 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java @@ -78,7 +78,7 @@ public class Swarm extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 1, 3 ); + return Random.NormalIntRange( 1, 4 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index 1f6c25d06..a23867fd4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -76,7 +76,7 @@ public class Tengu extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 10, 16 ); + return Random.NormalIntRange( 6, 20 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java index 45cded134..37fa52da8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java @@ -82,7 +82,7 @@ public class Thief extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 1, 8 ); + return Random.NormalIntRange( 1, 10 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index 0dbc5b124..ff84eb1d4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -60,7 +60,7 @@ public class Warlock extends Mob implements Callback { @Override public int damageRoll() { - return Random.NormalIntRange( 14, 24 ); + return Random.NormalIntRange( 16, 22 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java index 01e03f1ef..aaf5eac85 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java @@ -230,7 +230,7 @@ public class Yog extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 30, 40 ); + return Random.NormalIntRange( 20, 50 ); } @Override @@ -426,7 +426,7 @@ public class Yog extends Mob { @Override public int damageRoll() { - return Random.NormalIntRange( 24, 28 ); + return Random.NormalIntRange( 22, 30 ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index a969ab237..e537b6a60 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -230,11 +230,7 @@ public class Armor extends EquipableItem { } public int DRMin(int lvl){ - int effectiveTier = tier; - if (glyph != null) effectiveTier += glyph.tierDRAdjust(); - effectiveTier = Math.max(0, effectiveTier); - - return (effectiveTier-1)/2 + lvl; + return lvl; } @Override