Core/Player:
- Fix merge fail - Fix SkillRaceClassInfo structure
This commit is contained in:
1 parent
1bc482d3d6
commit
2f03e04b87
3 files changed
+20
-6
No files matched your search
@@ -1717,10 +1717,10 @@ struct SkillRaceClassInfoEntry
|
||||
uint32 RaceMask; // 2 m_raceMask
|
||||
uint32 ClassMask; // 3 m_classMask
|
||||
uint32 Flags; // 4 m_flags
|
||||
//uint32 MinLevel; // 5 m_minLevel
|
||||
uint32 SkillTier; // 6 m_skillTierID
|
||||
//uint32 SkillCostType; // 7 m_skillCostIndex
|
||||
//uint32 Unk; // 8 m_unk
|
||||
//uint32 Unk; // 5 m_unk
|
||||
//uint32 MinLevel; // 6 m_minLevel
|
||||
uint32 SkillTier; // 7 m_skillTierID
|
||||
//uint32 SkillCostType; // 8 m_skillCostIndex
|
||||
};
|
||||
|
||||
#define MAX_SKILL_STEP 16
|
||||
|
||||
@@ -122,7 +122,7 @@ char const ScalingStatDistributionfmt[] = "niiiiiiiiiiiiiiiiiiiixi";
|
||||
char const ScalingStatValuesfmt[] = "iniiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
|
||||
char const SkillLinefmt[] = "nisxixi";
|
||||
char const SkillLineAbilityfmt[] = "niiiixxiiiiiii";
|
||||
char const SkillRaceClassInfofmt[] = "diiiixixx";
|
||||
char const SkillRaceClassInfofmt[] = "diiiixxix";
|
||||
char const SkillTiersfmt[] = "nxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiii";
|
||||
char const SoundEntriesfmt[] = "nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
|
||||
char const SpellCastTimefmt[] = "nixx";
|
||||
|
||||
@@ -3869,7 +3869,7 @@ bool Player::addSpell(uint32 spellId, bool active, bool learning, bool dependent
|
||||
}
|
||||
|
||||
// add dependent skills
|
||||
uint16 maxskill = GetMaxSkillValueForLevel();
|
||||
uint16 maxskill = GetMaxSkillValueForLevel();
|
||||
|
||||
SpellLearnSkillNode const* spellLearnSkill = sSpellMgr->GetSpellLearnSkill(spellId);
|
||||
|
||||
@@ -3891,6 +3891,20 @@ bool Player::addSpell(uint32 spellId, bool active, bool learning, bool dependent
|
||||
SetSkill(spellLearnSkill->skill, spellLearnSkill->step, skill_value, skill_max_value);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
// not ranked skills
|
||||
for (SkillLineAbilityMap::const_iterator _spell_idx = skill_bounds.first; _spell_idx != skill_bounds.second; ++_spell_idx)
|
||||
{
|
||||
SkillLineEntry const* pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
|
||||
if (!pSkill)
|
||||
continue;
|
||||
|
||||
if (!HasSkill(pSkill->id))
|
||||
LearnDefaultSkill(pSkill->id, 0);
|
||||
}
|
||||
}
|
||||
|
||||
// learn dependent spells
|
||||
SpellLearnSpellMapBounds spell_bounds = sSpellMgr->GetSpellLearnSpellMapBounds(spellId);
|
||||
|
||||
|
||||
Reference in new issue
Block a user