pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-23 16:21:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Quest API] (Performance) Check event exists before export and execute EVENT_AGGRO_SAY, EVENT_SAY, and EVENT_PROXIMITY_SAY (#2882)

Browse Source 
* [Quest API] Add optional parsing to EVENT_AGGRO_SAY and EVENT_SAY

# Notes
- Optionally parse these events instead of always doing so.

* Optionally parse EVENT_PROXIMITY_SAY
This commit is contained in:
Alex King 2023-02-12 22:54:20 -05:00 committed by GitHub
parent 9e16cd8ae8
commit f9a87e26c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zone/client.cpp
View File

@ -1199,7 +1199,9 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
} }
parse->EventPlayer(EVENT_SAY, this, message, language); if (parse->PlayerHasQuestSub(EVENT_SAY)) {
parse->EventPlayer(EVENT_SAY, this, message, language);
}
if (sender != this) { if (sender != this) {
break; break;
@ -1220,8 +1222,9 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
CheckEmoteHail(t, message); CheckEmoteHail(t, message);
if (DistanceNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) { if (DistanceNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) {
if (parse->HasQuestSub(t->GetNPCTypeID(), EVENT_SAY)) {
parse->EventNPC(EVENT_SAY, t, this, message, language); parse->EventNPC(EVENT_SAY, t, this, message, language);
}
if (RuleB(TaskSystem, EnableTaskSystem)) { if (RuleB(TaskSystem, EnableTaskSystem)) {
if (UpdateTasksOnSpeakWith(t)) { if (UpdateTasksOnSpeakWith(t)) {
@ -1230,8 +1233,10 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
} }
} }
} else { } else {
if (DistanceSquaredNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) { if (parse->HasQuestSub(t->GetNPCTypeID(), EVENT_AGGRO_SAY)) {
parse->EventNPC(EVENT_AGGRO_SAY, t, this, message, language); if (DistanceSquaredNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) {
parse->EventNPC(EVENT_AGGRO_SAY, t, this, message, language);
}
} }
} }
@ -1239,9 +1244,13 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
else if (GetTarget() && GetTarget()->IsBot() && !IsInvisible(GetTarget())) { else if (GetTarget() && GetTarget()->IsBot() && !IsInvisible(GetTarget())) {
if (DistanceNoZ(m_Position, GetTarget()->GetPosition()) <= RuleI(Range, Say)) { if (DistanceNoZ(m_Position, GetTarget()->GetPosition()) <= RuleI(Range, Say)) {
if (GetTarget()->IsEngaged()) { if (GetTarget()->IsEngaged()) {
parse->EventBot(EVENT_AGGRO_SAY, GetTarget()->CastToBot(), this, message, language); if (parse->BotHasQuestSub(EVENT_AGGRO_SAY)) {
parse->EventBot(EVENT_AGGRO_SAY, GetTarget()->CastToBot(), this, message, language);
}
} else { } else {
parse->EventBot(EVENT_SAY, GetTarget()->CastToBot(), this, message, language); if (parse->BotHasQuestSub(EVENT_SAY)) {
parse->EventBot(EVENT_SAY, GetTarget()->CastToBot(), this, message, language);
}
} }
} }
} }

29
zone/entity.cpp
View File

@ -4134,24 +4134,31 @@ void EntityList::ClearAreas()
area_list.clear(); area_list.clear();
} }
void EntityList::ProcessProximitySay(const char *Message, Client *c, uint8 language) void EntityList::ProcessProximitySay(const char *message, Client *c, uint8 language)
{ {
if (!Message || !c) if (!message || !c) {
return; return;
}
auto iter = proximity_list.begin(); for (const auto& n : proximity_list) {
for (; iter != proximity_list.end(); ++iter) { auto* p = n->proximity;
NPC *d = (*iter); if (!p || !p->say) {
NPCProximity *l = d->proximity;
if (l == nullptr || !l->say)
continue; continue;
}
if (c->GetX() < l->min_x || c->GetX() > l->max_x if (!parse->HasQuestSub(n->GetNPCTypeID(), EVENT_PROXIMITY_SAY)) {
|| c->GetY() < l->min_y || c->GetY() > l->max_y
|| c->GetZ() < l->min_z || c->GetZ() > l->max_z)
continue; continue;
}
parse->EventNPC(EVENT_PROXIMITY_SAY, d, c, Message, language); if (
!EQ::ValueWithin(c->GetX(), p->min_x, p->max_x) ||
!EQ::ValueWithin(c->GetY(), p->min_y, p->max_y) ||
!EQ::ValueWithin(c->GetZ(), p->min_z, p->max_z)
) {
continue;
}
parse->EventNPC(EVENT_PROXIMITY_SAY, n, c, message, language);
} }
} }

2
zone/entity.h
View File

@ -263,7 +263,7 @@ public:
void RemoveArea(int id); void RemoveArea(int id);
void ClearAreas(); void ClearAreas();
void ReloadMerchants(); void ReloadMerchants();
void ProcessProximitySay(const char *Message, Client *c, uint8 language = 0); void ProcessProximitySay(const char *message, Client *c, uint8 language = 0);
void SendAATimer(uint32 charid,UseAA_Struct* uaa); void SendAATimer(uint32 charid,UseAA_Struct* uaa);
Doors *FindDoor(uint8 door_id); Doors *FindDoor(uint8 door_id);
Object *FindObject(uint32 object_id); Object *FindObject(uint32 object_id);