From 7fcce5a14e9a3f84b218a7143ef11014c27ef710 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 3 Feb 2023 14:08:34 -0500 Subject: [PATCH] v2.0.0: fixed duelist abilities benefitting from time freeze --- .../shatteredpixeldungeon/items/quest/Pickaxe.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Greataxe.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Mace.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Rapier.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/RunicBlade.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Sai.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Spear.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Sword.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Whip.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index eb7288414..f4c423b77 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -215,8 +215,8 @@ public class Pickaxe extends MeleeWeapon { } Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG); } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java index 360933231..412611959 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java @@ -95,8 +95,8 @@ public class Greataxe extends MeleeWeapon { onAbilityKill(hero); } } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java index c9984b1f1..e543044ac 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java @@ -94,8 +94,8 @@ public class Mace extends MeleeWeapon { wep.onAbilityKill(hero); } } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); wep.afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java index a0af23ae0..fc91a11de 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java @@ -126,8 +126,8 @@ public class Rapier extends MeleeWeapon { onAbilityKill(hero); } } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java index 6ddcb7091..004337d3e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java @@ -94,8 +94,8 @@ public class RunicBlade extends MeleeWeapon { } } tracker.detach(); - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java index bdd75811f..c5bdb2b0e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java @@ -101,6 +101,7 @@ public class Sai extends MeleeWeapon { } } + Invisibility.dispel(); if (recentHits >= 2 && hit){ for (Buff b : buffs){ b.detach(); @@ -110,7 +111,6 @@ public class Sai extends MeleeWeapon { } else { hero.spendAndNext(hero.attackDelay()); } - Invisibility.dispel(); wep.afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java index ba64def78..36c7be641 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java @@ -101,8 +101,8 @@ public class Spear extends MeleeWeapon { } Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG); } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); wep.afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java index 215eed91b..4f44115e1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java @@ -93,6 +93,7 @@ public class Sword extends MeleeWeapon { Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG); } + Invisibility.dispel(); hero.spendAndNext(hero.attackDelay()); if (!enemy.isAlive()){ wep.onAbilityKill(hero); @@ -102,7 +103,6 @@ public class Sword extends MeleeWeapon { hero.buff(CleaveTracker.class).detach(); } } - Invisibility.dispel(); wep.afterAbilityUsed(hero); } }); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java index 32885e7c7..a2d160c27 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java @@ -84,8 +84,8 @@ public class Whip extends MeleeWeapon { onAbilityKill(hero); } } - hero.spendAndNext(hero.attackDelay()); Invisibility.dispel(); + hero.spendAndNext(hero.attackDelay()); afterAbilityUsed(hero); } });