|
|
|
@ -85,25 +85,25 @@ public enum CombatManager {
@@ -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)) |
|
|
|
|