From 3d48951184ab0ed650c1bc0d9aaeb5b9deb4477f Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 21 Feb 2025 12:10:32 -0600 Subject: [PATCH] saetor parry all the time --- src/engine/gameManager/CombatManager.java | 6 ++++++ src/engine/objects/PlayerCharacter.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index b2625c4d..cece8d13 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -1017,6 +1017,12 @@ public enum CombatManager { AbstractCharacter tar = (AbstractCharacter) target; + if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){ + PlayerCharacter pc = (PlayerCharacter) target; + if(pc.getRaceID() == 1999) + return true; + } + CharacterItemManager acItem = ac.getCharItemManager(); CharacterItemManager tarItem = tar.getCharItemManager(); diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 58fb0c72..f57b624a 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -4710,7 +4710,7 @@ public class PlayerCharacter extends AbstractCharacter { ModType modType = ModType.GetModType(type); // must be allowed to use this passive - if (!this.bonuses.getBool(modType, SourceType.None)) + if (!this.bonuses.getBool(modType, SourceType.None) && this.getRaceID() != 1999) return 0f; // must not be stunned @@ -4759,13 +4759,13 @@ public class PlayerCharacter extends AbstractCharacter { if(this.bonuses != null) blockChance *= 1 + this.bonuses.getFloatPercentAll(ModType.Block, SourceType.None, null); return blockChance; - case "Parry": if(!fromCombat) return 0; if(mainHand == null && this.getRaceID() != 1999) // saetors can always parry using their horns return 0; + int parryBonus = 0; if(mainHand != null && offHand != null && !offHand.getItemBase().isShield())