Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: dep/PackageList.txt src/server/game/DataStores/DBCEnums.h src/server/game/DataStores/DBCStores.cpp src/server/game/DataStores/DBCStores.h src/server/game/DataStores/DBCfmt.h
This commit is contained in:
commit
3a63187b47
27 files changed
+1637
-4019
No files matched your search
@@ -2445,8 +2445,16 @@ void Spell::EffectLearnSkill(SpellEffIndex effIndex)
|
||||
return;
|
||||
|
||||
uint32 skillid = m_spellInfo->Effects[effIndex].MiscValue;
|
||||
SkillRaceClassInfoEntry const* rcEntry = GetSkillRaceClassInfo(skillid, unitTarget->getRace(), unitTarget->getClass());
|
||||
if (!rcEntry)
|
||||
return;
|
||||
|
||||
SkillTiersEntry const* tier = sSkillTiersStore.LookupEntry(rcEntry->SkillTier);
|
||||
if (!tier)
|
||||
return;
|
||||
|
||||
uint16 skillval = unitTarget->ToPlayer()->GetPureSkillValue(skillid);
|
||||
unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), skillval?skillval:1, damage*75);
|
||||
unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), std::min<uint16>(skillval, 1), tier->MaxSkill[damage - 1]);
|
||||
}
|
||||
|
||||
void Spell::EffectPlayMovie(SpellEffIndex effIndex)
|
||||
|
||||
Reference in new issue
Block a user