From a6386b3285175377eef23fac3214722b596814a5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 28 Sep 2019 23:33:40 -0400 Subject: [PATCH] v0.7.5: fixed inconsistency issues with slimes taking damage --- .../actors/mobs/Slime.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java index 783dac2d6..9978e6a42 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java @@ -53,27 +53,13 @@ public class Slime extends Mob { return 12; } - private int reduceDamage( int incomingDamage ){ - if (incomingDamage <= 4){ - return incomingDamage; - } else { - //takes 5/6/7/8/9/10 dmg at 5/7/10/14/19/25 incoming dmg - return 4 + (int)(Math.sqrt(8*(incomingDamage - 4) + 1) - 1)/2; - } - } - @Override public void damage(int dmg, Object src) { - if (src instanceof Char) { - super.damage(dmg, src); - } else { - super.damage(reduceDamage(dmg), src); + if (dmg >= 5){ + //takes 5/6/7/8/9/10 dmg at 5/7/10/14/19/25 incoming dmg + dmg = 4 + (int)(Math.sqrt(8*(dmg - 4) + 1) - 1)/2; } - } - - @Override - public int defenseProc(Char enemy, int damage) { - return super.defenseProc(enemy, reduceDamage(damage)); + super.damage(dmg, src); } @Override