konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: duelist guard now triggers before monk focus

Browse Source
This commit is contained in:
Evan Debenham
2023-03-09 17:36:34 -05:00
parent 59329f8ba0
commit 2caf7ccb3b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+6 -6
View File
@@ -542,6 +542,12 @@ public class Hero extends Char {
return Messages.get(Monk.class, "parried"); 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){ if (buff(MonkEnergy.MonkAbility.Focus.FocusBuff.class) != null){
buff(MonkEnergy.MonkAbility.Focus.FocusBuff.class).detach(); buff(MonkEnergy.MonkAbility.Focus.FocusBuff.class).detach();
if (sprite != null && sprite.visible) { if (sprite != null && sprite.visible) {
@@ -550,12 +556,6 @@ public class Hero extends Char {
return Messages.get(Monk.class, "parried"); 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(); return super.defenseVerb();
} }