From 9aea6b3e0e878c01faad293b3181587f72214955 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 30 Oct 2023 13:16:14 -0400 Subject: [PATCH] v2.3.0: consistency pass on variable delays for telegraphed attacks --- .../shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Elemental.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java | 2 +- .../shatteredpixeldungeon/actors/mobs/RipperDemon.java | 2 +- .../shatteredpixeldungeon/actors/mobs/YogDzewa.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java index 8d0707a63..624ab994b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java @@ -460,7 +460,7 @@ public class DM300 extends Mob { pos++; } } - Buff.append(this, FallingRockBuff.class, GameMath.gate(TICK, target.cooldown(), 3*TICK)).setRockPositions(rockCells); + Buff.append(this, FallingRockBuff.class, GameMath.gate(TICK, (int)Math.ceil(target.cooldown()), 3*TICK)).setRockPositions(rockCells); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index 35fdefa49..1f27abb79 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -312,7 +312,7 @@ public abstract class Elemental extends Mob { } GLog.n(Messages.get(this, "charging")); - spend(GameMath.gate(TICK, (int)Math.ceil(Dungeon.hero.cooldown()), 3*TICK)); + spend(GameMath.gate(attackDelay(), (int)Math.ceil(Dungeon.hero.cooldown()), 3*attackDelay())); Dungeon.hero.interrupt(); return true; } else { 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 8151f9cdd..d6145524b 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 @@ -210,7 +210,7 @@ public class Goo extends Mob { if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)){ pumpedUp += 2; //don't want to overly punish players with slow move or attack speed - spend(GameMath.gate(attackDelay(), Dungeon.hero.cooldown(), 3*attackDelay())); + spend(GameMath.gate(attackDelay(), (int)Math.ceil(enemy.cooldown()), 3*attackDelay())); } else { pumpedUp++; spend( attackDelay() ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java index d8843b1a9..20869c026 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java @@ -240,7 +240,7 @@ public class RipperDemon extends Mob { //get ready to leap leapPos = targetPos; //don't want to overly punish players with slow move or attack speed - spend(GameMath.gate(TICK, enemy.cooldown(), 3*TICK)); + spend(GameMath.gate(attackDelay(), (int)Math.ceil(enemy.cooldown()), 3*attackDelay())); if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[leapPos]){ GLog.w(Messages.get(RipperDemon.this, "leap")); sprite.parent.addToBack(new TargetedCell(leapPos, 0xFF0000)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java index 7cfdb3ffa..b95292530 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java @@ -303,7 +303,7 @@ public class YogDzewa extends Mob { } //don't want to overly punish players with slow move or attack speed - spend(GameMath.gate(TICK, Dungeon.hero.cooldown(), 3*TICK)); + spend(GameMath.gate(TICK, (int)Math.ceil(Dungeon.hero.cooldown()), 3*TICK)); Dungeon.hero.interrupt(); abilityCooldown += Random.NormalFloat(MIN_ABILITY_CD, MAX_ABILITY_CD);