Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: Implemented new action SMART_ACTION_CREDIT_QUEST_OBJECTIVE_TALK_TO (#30382)

Browse Source 
(cherry picked from commit 9261140c9d)
This commit is contained in:
Meji
2024-10-28 21:32:16 +01:00
committed by Ovahlord
parent 80a37787c6
commit 4dbc0a522a
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -2623,6 +2623,21 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
break;
}
case SMART_ACTION_CREDIT_QUEST_OBJECTIVE_TALK_TO:
{
if (!me)
break;
for (WorldObject* target : targets)
{
Player* player = Object::ToPlayer(target);
if (!player)
continue;
player->TalkedToCreature(me->GetEntry(), me->GetGUID());
}
break;
}
default:
TC_LOG_ERROR("sql.sql", "SmartScript::ProcessAction: Entry {} SourceType {}, Event {}, Unhandled Action type {}", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType());
break;

12
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
View File

@@ -1018,6 +1018,7 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e)
case SMART_ACTION_TRIGGER_GAME_EVENT: return sizeof(SmartAction::triggerGameEvent);
case SMART_ACTION_DO_ACTION: return sizeof(SmartAction::doAction);
case SMART_ACTION_COMPLETE_QUEST: return sizeof(SmartAction::quest);
case SMART_ACTION_CREDIT_QUEST_OBJECTIVE_TALK_TO: return NO_PARAMS;
default:
TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry {} SourceType {} Event {} Action {} is using an action with no unused params specified in SmartAIMgr::CheckUnusedActionParams(), please report this.",
e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType());
@@ -2431,6 +2432,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
break;
}
case SMART_ACTION_COMPLETE_QUEST:
{
if (Quest const* quest = sObjectMgr->GetQuestTemplate(e.action.quest.quest))
{
if (!quest->HasFlag(QUEST_FLAGS_COMPLETION_EVENT) && !quest->HasFlag(QUEST_FLAGS_COMPLETION_AREA_TRIGGER) && !quest->HasFlag(QUEST_FLAGS_TRACKING_EVENT))
@@ -2445,6 +2447,16 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
return false;
}
break;
}
case SMART_ACTION_CREDIT_QUEST_OBJECTIVE_TALK_TO:
{
if (e.GetScriptType() != SMART_SCRIPT_TYPE_CREATURE)
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry {} SourceType {} Event {} Action {} uses non-valid SourceType (only valid for SourceType {}), skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), SMART_SCRIPT_TYPE_CREATURE);
return false;
}
break;
}
// Unused
case SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS:
case SMART_ACTION_CALL_GROUPEVENTHAPPENS:

3
src/server/game/AI/SmartScripts/SmartScriptMgr.h
View File

@@ -606,7 +606,8 @@ enum SMART_ACTION
SMART_ACTION_TRIGGER_GAME_EVENT = 150, // eventId, useSaiTargetAsGameEventSource
SMART_ACTION_DO_ACTION = 151, // actionId
SMART_ACTION_COMPLETE_QUEST = 152, // QuestId. Regular quests with objectives can't be completed with this action (only quests with QUEST_FLAGS_COMPLETION_EVENT, QUEST_FLAGS_COMPLETION_AREA_TRIGGER or QUEST_FLAGS_TRACKING_EVENT)
SMART_ACTION_END = 153
SMART_ACTION_CREDIT_QUEST_OBJECTIVE_TALK_TO = 153,
SMART_ACTION_END = 154
};
enum class SmartActionSummonCreatureFlags