From b20cc11deea8bdbd7564d242372f52daf4fc2ecb Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 8 May 2021 23:01:13 -0400 Subject: [PATCH] v0.9.3: Goo's healing now reverts regen time gained by damaging it. --- .../shatteredpixeldungeon/actors/buffs/LockedFloor.java | 4 ++++ .../shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LockedFloor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LockedFloor.java index edc912131..aa527ef02 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LockedFloor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LockedFloor.java @@ -48,6 +48,10 @@ public class LockedFloor extends Buff { left += time; } + public void removeTime(float time){ + left -= time; //can go negative! + } + public boolean regenOn(){ return left >= 1; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index b9ddf1a87..00fd9ae7c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -96,6 +96,10 @@ public class Goo extends Mob { if (Dungeon.level.water[pos] && HP < HT) { HP += healInc; + + LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); + if (lock != null) lock.removeTime(healInc*2); + if (Dungeon.level.heroFOV[pos] ){ sprite.emitter().burst( Speck.factory( Speck.HEALING ), healInc ); }