diff options
4 files changed, 30 insertions, 8 deletions
diff --git a/sql/updates/world/master/2017_02_12_10_world_2016_08_19_02_world.sql b/sql/updates/world/master/2017_02_12_10_world_2016_08_19_02_world.sql new file mode 100644 index 00000000000..261f3317835 --- /dev/null +++ b/sql/updates/world/master/2017_02_12_10_world_2016_08_19_02_world.sql @@ -0,0 +1,3 @@ +-- +UPDATE `smart_scripts` SET `action_param2`=1 WHERE `action_type`=7; +UPDATE `smart_scripts` SET `action_param2`=0 WHERE `source_type`=0 AND `entryorguid`=11216 AND `id`=3; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 42698d0f4f7..d814143a9ae 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -316,7 +316,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u delete targets; break; } - case SMART_ACTION_ADD_QUEST: + case SMART_ACTION_OFFER_QUEST: { ObjectList* targets = GetTargets(e, unit); if (!targets) @@ -324,13 +324,26 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr) { - if (IsPlayer(*itr)) + if (Player* pTarget = (*itr)->ToPlayer()) { - if (Quest const* q = sObjectMgr->GetQuestTemplate(e.action.quest.quest)) + if (Quest const* q = sObjectMgr->GetQuestTemplate(e.action.questOffer.questID)) { - (*itr)->ToPlayer()->AddQuestAndCheckCompletion(q, nullptr); - TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_ADD_QUEST: Player %s add quest %u", - (*itr)->GetGUID().ToString().c_str(), e.action.quest.quest); + if (me && e.action.questOffer.directAdd == 0) + { + if (pTarget->CanTakeQuest(q, true)) + if (WorldSession* session = pTarget->GetSession()) + { + PlayerMenu menu(session); + menu.SendQuestGiverQuestDetails(q, me->GetGUID(), true); + TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_OFFER_QUEST: Player %s - offering quest %u", pTarget->GetGUID().ToString().c_str(), e.action.questOffer.questID); + } + } + else + { + (*itr)->ToPlayer()->AddQuestAndCheckCompletion(q, nullptr); + TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_ADD_QUEST: Player %s add quest %u", + (*itr)->GetGUID().ToString().c_str(), e.action.questOffer.questID); + } } } } diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 429f4b78531..a4ed92e6dcf 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -810,7 +810,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) return false; break; case SMART_ACTION_FAIL_QUEST: - case SMART_ACTION_ADD_QUEST: + case SMART_ACTION_OFFER_QUEST: if (!e.action.quest.quest || !IsQuestValid(e, e.action.quest.quest)) return false; break; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index fd8b6b8e999..2fde9031a36 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -443,7 +443,7 @@ enum SMART_ACTION SMART_ACTION_SOUND = 4, // SoundId, onlySelf SMART_ACTION_PLAY_EMOTE = 5, // EmoteId SMART_ACTION_FAIL_QUEST = 6, // QuestID - SMART_ACTION_ADD_QUEST = 7, // QuestID + SMART_ACTION_OFFER_QUEST = 7, // QuestID, directAdd SMART_ACTION_SET_REACT_STATE = 8, // state SMART_ACTION_ACTIVATE_GOBJECT = 9, // SMART_ACTION_RANDOM_EMOTE = 10, // EmoteId1, EmoteId2, EmoteId3... @@ -599,6 +599,12 @@ struct SmartAction struct { + uint32 questID; + uint32 directAdd; + } questOffer; + + struct + { uint32 state; } react; |