From b4ff1a3f7f899fc7f04b1539e42afb08210d6424 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 17 May 2024 20:34:26 -0500 Subject: [PATCH] swing animation lookup --- src/engine/gameManager/CombatManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 284a3577..775bdf0a 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -85,25 +85,25 @@ public enum CombatManager { return; } - if (mainWeapon == null && offWeapon != null && !offWeapon.template.item_skill_required.containsKey("Block")) { + if (mainWeapon == null && offWeapon != null && !offWeapon.template.item_skill_used.equals("Block")) { //swing left hand only processAttack(attacker, target, mbEnums.EquipSlotType.LHELD); return; } - if (mainWeapon == null && offWeapon != null && offWeapon.template.item_skill_required.containsKey("Block")) { + if (mainWeapon == null && offWeapon != null && offWeapon.template.item_skill_used.equals("Block")) { //no weapon equipped with a shield, punch with one hand processAttack(attacker, target, mbEnums.EquipSlotType.RHELD); return; } - if (mainWeapon != null && offWeapon != null && offWeapon.template.item_skill_required.containsKey("Block")) { + if (mainWeapon != null && offWeapon != null && offWeapon.template.item_skill_used.equals("Block")) { //one weapon equipped with a shield, swing with one hand processAttack(attacker, target, mbEnums.EquipSlotType.RHELD); return; } - if (mainWeapon != null && offWeapon != null && !offWeapon.template.item_skill_required.containsKey("Block")) { + if (mainWeapon != null && offWeapon != null && !offWeapon.template.item_skill_used.equals("Block")) { //two weapons equipped, swing both hands processAttack(attacker, target, mbEnums.EquipSlotType.RHELD); if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))