LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.5: fixed inconsistency issues with slimes taking damage

Browse Source
This commit is contained in:
Evan Debenham 2019-09-28 23:33:40 -04:00
parent 2694eb43bd
commit a6386b3285
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Slime.java
View File

@ -53,27 +53,13 @@ public class Slime extends Mob {
return 12; 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 @Override
public void damage(int dmg, Object src) { public void damage(int dmg, Object src) {
if (src instanceof Char) { 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;
}
super.damage(dmg, src); super.damage(dmg, src);
} else {
super.damage(reduceDamage(dmg), src);
}
}
@Override
public int defenseProc(Char enemy, int damage) {
return super.defenseProc(enemy, reduceDamage(damage));
} }
@Override @Override