From 3ab3e231d8ca2df3d1c4eef866d9f5ac51f2c5ec Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 6 Mar 2023 14:10:47 -0500 Subject: [PATCH] v2.0.0: adjusted meditate to count as 5 delays of 1 not 1 delay of 5 --- .../shatteredpixeldungeon/actors/buffs/MonkEnergy.java | 5 ++++- .../shatteredpixeldungeon/actors/hero/Hero.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java index 9a17644ff..e5fe1126e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java @@ -608,7 +608,10 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action { Buff.affect(hero, MeditateResistance.class, 5f); } - hero.spendAndNext(5f); + //we process this as 5x wait actions instead of one 5 tick action to prevent + // effects like time freeze from eating the whole action duration + for (int i = 0; i < 5; i++) hero.spendConstant(Actor.TICK); + hero.next(); Buff.affect(hero, MonkEnergy.class).abilityUsed(this); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index b91e09dfd..640ca5a7a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -726,7 +726,7 @@ public class Hero extends Char { } @Override - protected void spendConstant(float time) { + public void spendConstant(float time) { justMoved = false; super.spendConstant(time); }