From 10437a1e2ec01b8282d9c65b0f4e6981a96a8660 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 9 Oct 2016 01:55:14 -0300 Subject: Core/Unit: enabled parry for all creatures, not only humanoids If there's some creature that _shouldn't_ parry, use the `flags_extra` field in `creature_template` table --- src/server/game/Entities/Unit/Unit.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 34df0891448..1d4886c1915 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2789,16 +2789,13 @@ float Unit::GetUnitParryChance(WeaponAttackType attType, Unit const* victim) con } else if (victim->GetTypeId() == TYPEID_UNIT && !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)) { - if (victim->GetCreatureType() == CREATURE_TYPE_HUMANOID) - { - chance = 5.0f; - chance += victim->GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT); + chance = 5.0f; + chance += victim->GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT); - if (skillDiff <= 10) - skillBonus = skillDiff * 0.1f; - else - skillBonus = 1.0f + (skillDiff - 10) * 1.6f; - } + if (skillDiff <= 10) + skillBonus = skillDiff * 0.1f; + else + skillBonus = 1.0f + (skillDiff - 10) * 1.6f; } chance += skillBonus; -- cgit v1.2.3