Merge branch '4.3.4' into '4.3.4'

Fix Lock Picking Skill Value

The Skill Value of Lock Picking is since Cata increased with the Player Level. (PlayerLevel *5)
fix https://gitlab.com/trinitycore/TrinityCore_434/issues/43

See merge request !21
This commit is contained in:
Aokromes
2016-07-02 12:11:49 +00:00

View File

@@ -6968,9 +6968,13 @@ SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& sk
reqSkillValue = lockInfo->Skill[j];
// castitem check: rogue using skeleton keys. the skill values should not be added in this case.
skillValue = m_CastItem || m_caster->GetTypeId()!= TYPEID_PLAYER ?
skillValue = m_CastItem || m_caster->GetTypeId() != TYPEID_PLAYER ?
0 : m_caster->ToPlayer()->GetSkillValue(skillId);
// Pickpocketing is based on Playerlevels
if (m_spellInfo->Id == 1804 && skillId == SKILL_LOCKPICKING)
skillValue = 5 * m_caster->getLevel();
// skill bonus provided by casting spell (mostly item spells)
// add the effect base points modifier from the spell cast (cheat lock / skeleton key etc.)
if (m_spellInfo->Effects[effIndex].TargetA.GetTarget() == TARGET_GAMEOBJECT_ITEM_TARGET || m_spellInfo->Effects[effIndex].TargetB.GetTarget() == TARGET_GAMEOBJECT_ITEM_TARGET)