nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 05:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/SmartAI): improve SMART_EVENT_GOSSIP_HELLO (#8849)

Browse Source 
Add another value to event_param1 for SMART_EVENT_GOSSIP_HELLO to support all cases of OnGossipHello/OnReportUse in GameObjects:
- event_param1 set to 0: execute the action for both OnGossipHello and OnReportUse. This might result in the action being executed twice when clicking the GameObject
- event_param1 set to 1: execute the action for only OnGossipHello
- event_param1 set to 2: execute the action for only OnReportUse
This commit is contained in:
acidmanifesto
2021-11-04 04:49:20 -04:00
committed by GitHub
parent f30725144d
commit 6ff6f48e74
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4029,10 +4029,32 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui
case SMART_EVENT_ON_SPELLCLICK:
ProcessAction(e, unit, var0, var1, bvar, spell, gob);
break;
// Xinef: added no report use distinction for gameobjects
case SMART_EVENT_GOSSIP_HELLO:
if (e.event.gossipHello.noReportUse && var0)
return;
switch (e.event.gossipHello.filter)
{
case 0:
// no filter set, always execute action
break;
case 1:
// GossipHello only filter set, skip action if reportUse
if (var0)
{
return;
}
break;
case 2:
// reportUse only filter set, skip action if GossipHello
if (!var0)
{
return;
}
break;
default:
// Ignore any other value
break;
}
ProcessAction(e, unit, var0, var1, bvar, spell, gob);
break;
case SMART_EVENT_IS_BEHIND_TARGET:

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

@@ -162,7 +162,7 @@ enum SMART_EVENT
SMART_EVENT_LINK = 61, // INTERNAL USAGE, no params, used to link together multiple events, does not use any extra resources to iterate event lists needlessly
SMART_EVENT_GOSSIP_SELECT = 62, // menuID, actionID
SMART_EVENT_JUST_CREATED = 63, // none
SMART_EVENT_GOSSIP_HELLO = 64, // none
SMART_EVENT_GOSSIP_HELLO = 64, // event_para_1 (only) 0 = no filter set, always execute action, 1 = GossipHello only filter set, skip action if reportUse, 2 = reportUse only filter set, skip action if GossipHello
SMART_EVENT_FOLLOW_COMPLETED = 65, // none
SMART_EVENT_UNUSED_66 = 66, // UNUSED
SMART_EVENT_IS_BEHIND_TARGET = 67, // cooldownMin, CooldownMax
@@ -362,7 +362,7 @@ struct SmartEvent
struct
{
uint32 noReportUse;
uint32 filter;
} gossipHello;
struct