diff options
| author | Intel <chemicstry@gmail.com> | 2014-11-12 03:58:17 +0200 |
|---|---|---|
| committer | Intel <chemicstry@gmail.com> | 2014-11-12 21:43:48 +0200 |
| commit | da52c8d54ec341cc55f963fe0397fcc5e98b06e9 (patch) | |
| tree | 6b2249c92c3567ae560f9c2c989114c9d1d5e124 /src/server/scripts/Commands | |
| parent | 620f23d9dcb94b21c2b3402765817362e2b82b2f (diff) | |
Core/Talents:
Fixed SMSG_TALENTS_INFO packet
Fixed talents saving to DB
Renamed 'talent spec' to 'talent group' since this name was shadowing character specializations (and new name is correct according to JAM)
Enabled loading of MinorTalent.dbc (will be used later)
Added additional specialization check in LearnTalent
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_learn.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_reset.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 81499567b72..2cf97403595 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -204,7 +204,7 @@ public: // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) player->LearnSpellHighestRank(talentInfo->SpellID); - player->AddTalent(talentInfo->SpellID, player->GetActiveSpec(), true); + player->AddTalent(talentInfo->SpellID, player->GetActiveTalentGroup()); } handler->SendSysMessage(LANG_COMMAND_LEARN_CLASS_TALENTS); diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 9d2621c0010..4a58a7f7e5d 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -204,6 +204,7 @@ public: Player* target; ObjectGuid targetGuid; std::string targetName; + /* TODO: 6.x remove/update pet talents if (!handler->extractPlayerTarget((char*)args, &target, &targetGuid, &targetName)) { // Try reset talents as Hunter Pet @@ -227,19 +228,22 @@ public: handler->SetSentErrorMessage(true); return false; } + */ if (target) { target->ResetTalents(true); - target->SendTalentsInfoData(false); + target->SendTalentsInfoData(); ChatHandler(target->GetSession()).SendSysMessage(LANG_RESET_TALENTS); if (!handler->GetSession() || handler->GetSession()->GetPlayer() != target) handler->PSendSysMessage(LANG_RESET_TALENTS_ONLINE, handler->GetNameLink(target).c_str()); + /* TODO: 6.x remove/update pet talents Pet* pet = target->GetPet(); Pet::resetTalentsForAllPetsOf(target, pet); if (pet) target->SendTalentsInfoData(true); + */ return true; } else if (!targetGuid.IsEmpty()) |