From 2caf7ccb3b484149f35533a6f80c868faf3b10c5 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 9 Mar 2023 17:36:34 -0500 Subject: [PATCH] v2.0.0: duelist guard now triggers before monk focus --- .../shatteredpixeldungeon/actors/hero/Hero.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 b6421766d..606ffee21 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 @@ -542,6 +542,12 @@ public class Hero extends Char { return Messages.get(Monk.class, "parried"); } + if (buff(RoundShield.GuardTracker.class) != null){ + buff(RoundShield.GuardTracker.class).detach(); + Sample.INSTANCE.play(Assets.Sounds.HIT_PARRY, 1, Random.Float(0.96f, 1.05f)); + return Messages.get(RoundShield.GuardTracker.class, "guarded"); + } + if (buff(MonkEnergy.MonkAbility.Focus.FocusBuff.class) != null){ buff(MonkEnergy.MonkAbility.Focus.FocusBuff.class).detach(); if (sprite != null && sprite.visible) { @@ -550,12 +556,6 @@ public class Hero extends Char { return Messages.get(Monk.class, "parried"); } - if (buff(RoundShield.GuardTracker.class) != null){ - buff(RoundShield.GuardTracker.class).detach(); - Sample.INSTANCE.play(Assets.Sounds.HIT_PARRY, 1, Random.Float(0.96f, 1.05f)); - return Messages.get(RoundShield.GuardTracker.class, "guarded"); - } - return super.defenseVerb(); }