aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-09 01:55:14 -0300
committerariel- <ariel-@users.noreply.github.com>2016-10-09 01:55:14 -0300
commit10437a1e2ec01b8282d9c65b0f4e6981a96a8660 (patch)
tree3f36ab95cd13059db468ebdf9d84a49331ca6266 /src
parent86903f701540fab062c4d7772c201507fc031c63 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp15
1 files changed, 6 insertions, 9 deletions
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;