diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-07-28 11:16:06 -0700 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-07-28 11:16:06 -0700 |
| commit | 21a70dbab004dad172e6eeef840d0d3f73417873 (patch) | |
| tree | 8aac159a04e6a3f80ffa03520464013354ac45aa /src | |
| parent | 738289daf7cf08937baabffc26909c029b4eefde (diff) | |
| parent | ef387cb6ff46a82c5dbee917b421fa8fa277dd0e (diff) | |
Merge pull request #15145 from pete318/runeforging6x
[6.x] Core/Spell: Learn DK runeforging skill, when receving the spell book ability.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a9b229bf00b..cb9957f3be6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3657,7 +3657,8 @@ bool Player::AddSpell(uint32 spellId, bool active, bool learning, bool dependent if (!pSkill) continue; - if ((_spell_idx->second->AquireMethod == SKILL_LINE_ABILITY_LEARNED_ON_SKILL_LEARN && !HasSkill(pSkill->ID))) + // Runeforging special case + if ((_spell_idx->second->AquireMethod == SKILL_LINE_ABILITY_LEARNED_ON_SKILL_LEARN && !HasSkill(pSkill->ID)) || ((pSkill->ID == SKILL_RUNEFORGING_2) && _spell_idx->second->TrivialSkillLineRankHigh == 0)) if (SkillRaceClassInfoEntry const* rcInfo = GetSkillRaceClassInfo(pSkill->ID, getRace(), getClass())) LearnDefaultSkill(rcInfo); } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 89b874697e5..84b87d93de5 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7802,7 +7802,7 @@ SkillRangeType GetSkillRangeType(SkillRaceClassInfoEntry const* rcEntry) if (sObjectMgr->GetSkillTier(rcEntry->SkillTierID)) return SKILL_RANGE_RANK; - if (rcEntry->SkillID == SKILL_RUNEFORGING) + if (rcEntry->SkillID == SKILL_RUNEFORGING || rcEntry->SkillID == SKILL_RUNEFORGING_2) return SKILL_RANGE_MONO; switch (skill->CategoryID) |