diff options
author | PolarCookie <sei009@post.uit.no> | 2019-04-10 12:58:40 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-11-27 00:21:08 +0100 |
commit | 0bde06c4027d2e60edc30b55fa7b42da8d253d29 (patch) | |
tree | 97712d17c00b8a0055bcce47b07af16c1390f2fc /src/server | |
parent | 7f57f6f6061f44a98a021d3de35d524e0fc8eec8 (diff) |
Core support for breadcrumb quests (#23157)
* Breadcrumb quests support in core
* To Winterspring! & Starfall
* translating ZenoX92's list, part 1
* Carendin Summons is Blood Elf only
* Breadcrumb to an exclusive group
* translating ZenoX92's list, part 2
* class quests
* breadcrumb trails
* better prevquest check
* less harsh error warnings
* minor optimization
* Rename 9999_99_99_99_world.sql to 2019_04_10_00_world.sql
(cherry picked from commit 5ed77113b637c49e99a610b00f385c51da67c3bf)
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 58 | ||||
-rw-r--r-- | src/server/game/Entities/Player/Player.h | 10 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 58 | ||||
-rw-r--r-- | src/server/game/Quests/QuestDef.cpp | 23 | ||||
-rw-r--r-- | src/server/game/Quests/QuestDef.h | 3 |
5 files changed, 126 insertions, 26 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 30638cb502c..9751b596fe2 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15037,7 +15037,7 @@ Quest const* Player::GetNextQuest(ObjectGuid guid, Quest const* quest) const return nullptr; } -bool Player::CanSeeStartQuest(Quest const* quest) +bool Player::CanSeeStartQuest(Quest const* quest) const { if (!DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) && SatisfyQuestClass(quest, false) && SatisfyQuestRace(quest, false) && SatisfyQuestSkill(quest, false) && SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) && @@ -15051,7 +15051,7 @@ bool Player::CanSeeStartQuest(Quest const* quest) return false; } -bool Player::CanTakeQuest(Quest const* quest, bool msg) +bool Player::CanTakeQuest(Quest const* quest, bool msg) const { return !DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, quest->GetQuestId(), this) && SatisfyQuestStatus(quest, msg) && SatisfyQuestExclusiveGroup(quest, msg) @@ -15960,7 +15960,8 @@ bool Player::SatisfyQuestLog(bool msg) const bool Player::SatisfyQuestDependentQuests(Quest const* qInfo, bool msg) const { - return SatisfyQuestPreviousQuest(qInfo, msg) && SatisfyQuestDependentPreviousQuests(qInfo, msg); + return SatisfyQuestPreviousQuest(qInfo, msg) && SatisfyQuestDependentPreviousQuests(qInfo, msg) && + SatisfyQuestBreadcrumbQuest(qInfo, msg) && SatisfyQuestDependentBreadcrumbQuests(qInfo, msg); } bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const @@ -16048,6 +16049,51 @@ bool Player::SatisfyQuestDependentPreviousQuests(Quest const* qInfo, bool msg) c return false; } +bool Player::SatisfyQuestBreadcrumbQuest(Quest const* qInfo, bool msg) const +{ + uint32 breadcrumbTargetQuestId = std::abs(qInfo->GetBreadcrumbForQuestId()); + + //If this is not a breadcrumb quest. + if (!breadcrumbTargetQuestId) + return true; + + // If the target quest is not available + if (!CanTakeQuest(sObjectMgr->GetQuestTemplate(breadcrumbTargetQuestId), false)) + { + if (msg) + { + SendCanTakeQuestResponse(QUEST_ERR_NONE); + TC_LOG_DEBUG("misc", "Player::SatisfyQuestBreadcrumbQuest: Sent INVALIDREASON_DONT_HAVE_REQ (QuestID: %u) because target quest (QuestID: %u) is not available to player '%s' (%s).", + qInfo->GetQuestId(), breadcrumbTargetQuestId, GetName().c_str(), GetGUID().ToString().c_str()); + } + + return false; + } + + return true; +} + +bool Player::SatisfyQuestDependentBreadcrumbQuests(Quest const* qInfo, bool msg) const +{ + for (uint32 breadcrumbQuestId : qInfo->DependentBreadcrumbQuests) + { + QuestStatus status = GetQuestStatus(breadcrumbQuestId); + // If any of the breadcrumb quests are in the quest log, return false. + if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_FAILED) + { + if (msg) + { + SendCanTakeQuestResponse(QUEST_ERR_NONE); + TC_LOG_DEBUG("misc", "Player::SatisfyQuestDependentBreadcrumbQuests: Sent INVALIDREASON_DONT_HAVE_REQ (QuestID: %u) because player '%s' (%s) has a breadcrumb quest towards this quest in the quest log.", + qInfo->GetQuestId(), GetName().c_str(), GetGUID().ToString().c_str()); + } + + return false; + } + } + return true; +} + bool Player::SatisfyQuestClass(Quest const* qInfo, bool msg) const { uint32 reqClass = qInfo->GetAllowableClasses(); @@ -16086,7 +16132,7 @@ bool Player::SatisfyQuestRace(Quest const* qInfo, bool msg) const return true; } -bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) +bool Player::SatisfyQuestReputation(Quest const* qInfo, bool msg) const { uint32 fIdMin = qInfo->GetRequiredMinRepFaction(); //Min required rep if (fIdMin && GetReputationMgr().GetReputation(fIdMin) < qInfo->GetRequiredMinRepValue()) @@ -16141,9 +16187,9 @@ bool Player::SatisfyQuestStatus(Quest const* qInfo, bool msg) const return true; } -bool Player::SatisfyQuestConditions(Quest const* qInfo, bool msg) +bool Player::SatisfyQuestConditions(Quest const* qInfo, bool msg) const { - if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_AVAILABLE, qInfo->GetQuestId(), this)) + if (!sConditionMgr->IsObjectMeetingNotGroupedConditions(CONDITION_SOURCE_TYPE_QUEST_AVAILABLE, qInfo->GetQuestId(), const_cast<Player*>(this))) { if (msg) { diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 7cd807e6e53..9774f6a9b69 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1499,8 +1499,8 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SendPreparedQuest(WorldObject* source); bool IsActiveQuest(uint32 quest_id) const; Quest const* GetNextQuest(ObjectGuid guid, Quest const* quest) const; - bool CanSeeStartQuest(Quest const* quest); - bool CanTakeQuest(Quest const* quest, bool msg); + bool CanSeeStartQuest(Quest const* quest) const; + bool CanTakeQuest(Quest const* quest, bool msg) const; bool CanAddQuest(Quest const* quest, bool msg) const; bool CanCompleteQuest(uint32 quest_id, uint32 ignoredQuestObjectiveId = 0); bool CanCompleteRepeatableQuest(Quest const* quest); @@ -1526,11 +1526,13 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> bool SatisfyQuestDependentQuests(Quest const* qInfo, bool msg) const; bool SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg) const; bool SatisfyQuestDependentPreviousQuests(Quest const* qInfo, bool msg) const; + bool SatisfyQuestBreadcrumbQuest(Quest const* qInfo, bool msg) const; + bool SatisfyQuestDependentBreadcrumbQuests(Quest const* qInfo, bool msg) const; bool SatisfyQuestClass(Quest const* qInfo, bool msg) const; bool SatisfyQuestRace(Quest const* qInfo, bool msg) const; - bool SatisfyQuestReputation(Quest const* qInfo, bool msg); + bool SatisfyQuestReputation(Quest const* qInfo, bool msg) const; bool SatisfyQuestStatus(Quest const* qInfo, bool msg) const; - bool SatisfyQuestConditions(Quest const* qInfo, bool msg); + bool SatisfyQuestConditions(Quest const* qInfo, bool msg) const; bool SatisfyQuestTimed(Quest const* qInfo, bool msg) const; bool SatisfyQuestExclusiveGroup(Quest const* qInfo, bool msg) const; bool SatisfyQuestDay(Quest const* qInfo, bool msg) const; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ce3d12c8ef4..4cbe4830866 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4326,11 +4326,11 @@ void ObjectMgr::LoadQuests() // 0 1 2 3 4 5 6 7 8 9 { "ID, Emote1, Emote2, Emote3, Emote4, EmoteDelay1, EmoteDelay2, EmoteDelay3, EmoteDelay4, RewardText", "quest_offer_reward", "", "reward emotes", &Quest::LoadQuestOfferReward }, - // 0 1 2 3 4 5 6 7 8 - { "ID, MaxLevel, AllowableClasses, SourceSpellID, PrevQuestID, NextQuestID, ExclusiveGroup, RewardMailTemplateID, RewardMailDelay," - // 9 10 11 12 13 14 15 16 + // 0 1 2 3 4 5 6 7 8 9 + { "ID, MaxLevel, AllowableClasses, SourceSpellID, PrevQuestID, NextQuestID, ExclusiveGroup, BreadcrumbForQuestId, RewardMailTemplateID, RewardMailDelay," + // 10 11 12 13 14 15 16 17 " RequiredSkillID, RequiredSkillPoints, RequiredMinRepFaction, RequiredMaxRepFaction, RequiredMinRepValue, RequiredMaxRepValue, ProvidedItemCount, SpecialFlags," - // 17 + // 18 " ScriptName", "quest_template_addon", "", "template addons", &Quest::LoadQuestTemplateAddon }, // 0 1 @@ -4986,8 +4986,11 @@ void ObjectMgr::LoadQuests() // fill additional data stores if (uint32 prevQuestId = std::abs(qinfo->_prevQuestID)) { - if (!_questTemplates.count(prevQuestId)) + auto prevQuestItr = _questTemplates.find(prevQuestId); + if (prevQuestItr == _questTemplates.end()) TC_LOG_ERROR("sql.sql", "Quest %d has PrevQuestId %i, but no such quest", qinfo->GetQuestId(), qinfo->GetPrevQuestId()); + else if (prevQuestItr->second._breadcrumbForQuestId) + TC_LOG_ERROR("sql.sql", "Quest %u should not be unlocked by breadcrumb quest %u", qinfo->_id, prevQuestId); } if (uint32 nextQuestId = qinfo->_nextQuestID) @@ -4999,10 +5002,55 @@ void ObjectMgr::LoadQuests() nextQuestItr->second.DependentPreviousQuests.push_back(qinfo->GetQuestId()); } + if (uint32 breadcrumbForQuestId = std::abs(qinfo->_breadcrumbForQuestId)) + { + if (_questTemplates.find(breadcrumbForQuestId) == _questTemplates.end()) + { + TC_LOG_ERROR("sql.sql", "Quest %u is a breadcrumb for quest %u, but no such quest exists", qinfo->_id, breadcrumbForQuestId); + qinfo->_breadcrumbForQuestId = 0; + } + if (qinfo->_nextQuestID) + TC_LOG_ERROR("sql.sql", "Quest %u is a breadcrumb, should not unlock quest %u", qinfo->_id, qinfo->_nextQuestID); + if (qinfo->_exclusiveGroup) + TC_LOG_ERROR("sql.sql", "Quest %u is a breadcrumb in exclusive group %i", qinfo->_id, qinfo->_exclusiveGroup); + } + if (qinfo->_exclusiveGroup) _exclusiveQuestGroups.insert(std::pair<int32, uint32>(qinfo->_exclusiveGroup, qinfo->GetQuestId())); } + // Disallow any breadcrumb loops and inform quests of their breadcrumbs + for (auto& questPair : _questTemplates) + { + // skip post-loading checks for disabled quests + if (DisableMgr::IsDisabledFor(DISABLE_TYPE_QUEST, questPair.first, nullptr)) + continue; + + Quest* qinfo = &questPair.second; + uint32 qid = qinfo->GetQuestId(); + uint32 breadcrumbForQuestId = std::abs(qinfo->_breadcrumbForQuestId); + std::set<uint32> questSet; + + while(breadcrumbForQuestId) + { + //a previously visited quest was found as a breadcrumb quest + //breadcrumb loop found! + if (!questSet.insert(qinfo->_id).second) + { + TC_LOG_ERROR("sql.sql", "Breadcrumb quests %u and %u are in a loop", qid, breadcrumbForQuestId); + qinfo->_breadcrumbForQuestId = 0; + break; + } + + qinfo = const_cast<Quest*>(sObjectMgr->GetQuestTemplate(breadcrumbForQuestId)); + + //every quest has a list of every breadcrumb towards it + qinfo->DependentBreadcrumbQuests.push_back(qid); + + breadcrumbForQuestId = qinfo->GetBreadcrumbForQuestId(); + } + } + // check QUEST_SPECIAL_FLAGS_EXPLORATION_OR_EVENT for spell with SPELL_EFFECT_QUEST_COMPLETE for (SpellNameEntry const* spellNameEntry : sSpellNameStore) { diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 5cdf17c01ca..ad918fe67d6 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -217,17 +217,18 @@ void Quest::LoadQuestTemplateAddon(Field* fields) _prevQuestID = fields[4].GetInt32(); _nextQuestID = fields[5].GetUInt32(); _exclusiveGroup = fields[6].GetInt32(); - _rewardMailTemplateId = fields[7].GetUInt32(); - _rewardMailDelay = fields[8].GetUInt32(); - _requiredSkillId = fields[9].GetUInt16(); - _requiredSkillPoints = fields[10].GetUInt16(); - _requiredMinRepFaction = fields[11].GetUInt16(); - _requiredMaxRepFaction = fields[12].GetUInt16(); - _requiredMinRepValue = fields[13].GetInt32(); - _requiredMaxRepValue = fields[14].GetInt32(); - _sourceItemIdCount = fields[15].GetUInt8(); - _specialFlags = fields[16].GetUInt8(); - _scriptId = sObjectMgr->GetScriptId(fields[17].GetString()); + _breadcrumbForQuestId = fields[7].GetInt32(); + _rewardMailTemplateId = fields[8].GetUInt32(); + _rewardMailDelay = fields[9].GetUInt32(); + _requiredSkillId = fields[10].GetUInt16(); + _requiredSkillPoints = fields[11].GetUInt16(); + _requiredMinRepFaction = fields[12].GetUInt16(); + _requiredMaxRepFaction = fields[13].GetUInt16(); + _requiredMinRepValue = fields[14].GetInt32(); + _requiredMaxRepValue = fields[15].GetInt32(); + _sourceItemIdCount = fields[16].GetUInt8(); + _specialFlags = fields[17].GetUInt8(); + _scriptId = sObjectMgr->GetScriptId(fields[18].GetString()); if (_specialFlags & QUEST_SPECIAL_FLAGS_AUTO_ACCEPT) _flags |= QUEST_FLAGS_AUTO_ACCEPT; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 3b0c541b3a8..7468cd26926 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -529,6 +529,7 @@ class TC_GAME_API Quest int32 GetPrevQuestId() const { return _prevQuestID; } uint32 GetNextQuestId() const { return _nextQuestID; } int32 GetExclusiveGroup() const { return _exclusiveGroup; } + int32 GetBreadcrumbForQuestId() const { return _breadcrumbForQuestId; } uint32 GetNextQuestInChain() const { return _nextQuestInChain; } int32 GetRewArenaPoints() const {return _rewardArenaPoints; } uint32 GetXPDifficulty() const { return _rewardXPDifficulty; } @@ -638,6 +639,7 @@ class TC_GAME_API Quest void BuildQuestRewards(WorldPackets::Quest::QuestRewards& rewards, Player* player) const; std::vector<uint32> DependentPreviousQuests; + std::vector<uint32> DependentBreadcrumbQuests; std::array<WorldPacket, TOTAL_LOCALES> QueryData; private: @@ -720,6 +722,7 @@ class TC_GAME_API Quest int32 _prevQuestID = 0; uint32 _nextQuestID = 0; int32 _exclusiveGroup = 0; + int32 _breadcrumbForQuestId = 0; uint32 _rewardMailTemplateId = 0; uint32 _rewardMailDelay = 0; uint32 _requiredSkillId = 0; |