From 9cad140836c97b96eae8050d543b3a6de5e02592 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 25 Feb 2025 20:11:02 -0600 Subject: [PATCH] saetors no longer parry incoming ranged damage --- src/engine/gameManager/CombatManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 4fa31bb9..6b81b32f 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -1069,12 +1069,6 @@ 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(); @@ -1086,6 +1080,12 @@ public enum CombatManager { Item tarMain = tarItem.getItemFromEquipped(1); Item tarOff = tarItem.getItemFromEquipped(2); + if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){ + PlayerCharacter pc = (PlayerCharacter) target; + if(pc.getRaceID() == 1999 && !isRanged(acMain) && !isRanged(acOff)) + return true; + } + return !isRanged(acMain) && !isRanged(acOff) && !isRanged(tarMain) && !isRanged(tarOff); }