From 7242fdbf609845311ba1d7639cca44c29d7c055c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 5 Dec 2020 15:56:51 -0500 Subject: [PATCH] v0.9.1: fixed shield dmg counting toward regen in the DM-300 fight --- .../shatteredpixeldungeon/actors/mobs/NewDM300.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java index a07477427..0efc4cb04 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewDM300.java @@ -427,13 +427,17 @@ public class NewDM300 extends Mob { @Override public void damage(int dmg, Object src) { + int preHP = HP; super.damage(dmg, src); if (isInvulnerable(src.getClass())){ return; } - LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); - if (lock != null && !isImmune(src.getClass())) lock.addTime(dmg); + int dmgTaken = preHP - HP; + if (dmgTaken > 0) { + LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); + if (lock != null && !isImmune(src.getClass())) lock.addTime(dmgTaken*1.5f); + } int threshold = HT/3 * (2- pylonsActivated);