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

[Quest API] Export $hate_entity to EVENT_HATE_LIST in Perl (#2885)

Browse Source 
# Notes
- Exports `$hate_entity` to `EVENT_HATE_LIST`.
- Allows operators to see which mob is joining/leaving an NPC's hatelist.
This commit is contained in:
Alex King 2023-02-12 23:44:31 -05:00 committed by GitHub
parent 2c75e8fcd4
commit 7099e17c7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/embparser.cpp
View File

@ -1743,6 +1743,7 @@ void PerlembParser::ExportEventVariables(
case EVENT_HATE_LIST: { case EVENT_HATE_LIST: {
ExportVar(package_name.c_str(), "hate_state", data); ExportVar(package_name.c_str(), "hate_state", data);
ExportVar(package_name.c_str(), "hate_entity", "Mob", mob);
break; break;
} }

48
zone/hate_list.cpp
View File

@ -66,7 +66,9 @@ void HateList::WipeHateList()
Mob* m = (*iterator)->entity_on_hatelist; Mob* m = (*iterator)->entity_on_hatelist;
if (m) if (m)
{ {
if (parse->HasQuestSub(hate_owner->GetNPCTypeID(), EVENT_HATE_LIST)) {
parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), m, "0", 0); parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), m, "0", 0);
}
if (m->IsClient()) { if (m->IsClient()) {
m->CastToClient()->DecrementAggroCount(); m->CastToClient()->DecrementAggroCount();
@ -183,18 +185,20 @@ Mob* HateList::GetClosestEntOnHateList(Mob *hater, bool skip_mezzed) {
void HateList::AddEntToHateList(Mob *in_entity, int64 in_hate, int64 in_damage, bool in_is_entity_frenzied, bool iAddIfNotExist) void HateList::AddEntToHateList(Mob *in_entity, int64 in_hate, int64 in_damage, bool in_is_entity_frenzied, bool iAddIfNotExist)
{ {
if (!in_entity) if (!in_entity) {
return; return;
}
if (in_entity->IsCorpse()) if (in_entity->IsCorpse()) {
return; return;
}
if (in_entity->IsClient() && in_entity->CastToClient()->IsDead()) if (in_entity->IsClient() && in_entity->CastToClient()->IsDead()) {
return; return;
}
struct_HateList *entity = Find(in_entity); struct_HateList *entity = Find(in_entity);
if (entity) if (entity) {
{
entity->hatelist_damage += (in_damage >= 0) ? in_damage : 0; entity->hatelist_damage += (in_damage >= 0) ? in_damage : 0;
entity->stored_hate_amount += in_hate; entity->stored_hate_amount += in_hate;
entity->is_entity_frenzy = in_is_entity_frenzied; entity->is_entity_frenzy = in_is_entity_frenzied;
@ -209,8 +213,7 @@ void HateList::AddEntToHateList(Mob *in_entity, int64 in_hate, int64 in_damage,
entity->stored_hate_amount, entity->stored_hate_amount,
entity->hatelist_damage entity->hatelist_damage
); );
} } else if (iAddIfNotExist) {
else if (iAddIfNotExist) {
entity = new struct_HateList; entity = new struct_HateList;
entity->entity_on_hatelist = in_entity; entity->entity_on_hatelist = in_entity;
entity->hatelist_damage = (in_damage >= 0) ? in_damage : 0; entity->hatelist_damage = (in_damage >= 0) ? in_damage : 0;
@ -219,7 +222,10 @@ void HateList::AddEntToHateList(Mob *in_entity, int64 in_hate, int64 in_damage,
entity->oor_count = 0; entity->oor_count = 0;
entity->last_modified = Timer::GetCurrentTime(); entity->last_modified = Timer::GetCurrentTime();
list.push_back(entity); list.push_back(entity);
if (parse->HasQuestSub(hate_owner->GetNPCTypeID(), EVENT_HATE_LIST)) {
parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), in_entity, "1", 0); parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), in_entity, "1", 0);
}
if (in_entity->IsClient()) { if (in_entity->IsClient()) {
in_entity->CastToClient()->IncrementAggroCount(hate_owner->CastToNPC()->IsRaidTarget()); in_entity->CastToClient()->IncrementAggroCount(hate_owner->CastToNPC()->IsRaidTarget());
@ -229,31 +235,33 @@ void HateList::AddEntToHateList(Mob *in_entity, int64 in_hate, int64 in_damage,
bool HateList::RemoveEntFromHateList(Mob *in_entity) bool HateList::RemoveEntFromHateList(Mob *in_entity)
{ {
if (!in_entity) if (!in_entity) {
return false; return false;
}
bool is_found = false; bool is_found = false;
auto iterator = list.begin(); auto iterator = list.begin();
while (iterator != list.end()) while (iterator != list.end()) {
{ if ((*iterator)->entity_on_hatelist == in_entity) {
if ((*iterator)->entity_on_hatelist == in_entity)
{
is_found = true; is_found = true;
if (in_entity && in_entity->IsClient()) if (in_entity && in_entity->IsClient()) {
in_entity->CastToClient()->DecrementAggroCount(); in_entity->CastToClient()->DecrementAggroCount();
}
delete (*iterator); delete (*iterator);
iterator = list.erase(iterator); iterator = list.erase(iterator);
if (in_entity) if (in_entity) {
if (parse->HasQuestSub(hate_owner->GetNPCTypeID(), EVENT_HATE_LIST)) {
parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), in_entity, "0", 0); parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), in_entity, "0", 0);
} }
else }
} else {
++iterator; ++iterator;
} }
}
return is_found; return is_found;
} }
@ -811,19 +819,23 @@ void HateList::RemoveStaleEntries(int time_ms, float dist)
if (m) { if (m) {
bool remove = false; bool remove = false;
if (cur_time - (*it)->last_modified > time_ms) if (cur_time - (*it)->last_modified > time_ms) {
remove = true; remove = true;
}
if (!remove && DistanceSquaredNoZ(hate_owner->GetPosition(), m->GetPosition()) > dist2) { if (!remove && DistanceSquaredNoZ(hate_owner->GetPosition(), m->GetPosition()) > dist2) {
(*it)->oor_count++; (*it)->oor_count++;
if ((*it)->oor_count == 2) if ((*it)->oor_count == 2) {
remove = true; remove = true;
}
} else if ((*it)->oor_count != 0) { } else if ((*it)->oor_count != 0) {
(*it)->oor_count = 0; (*it)->oor_count = 0;
} }
if (remove) { if (remove) {
if (parse->HasQuestSub(hate_owner->GetNPCTypeID(), EVENT_HATE_LIST)) {
parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), m, "0", 0); parse->EventNPC(EVENT_HATE_LIST, hate_owner->CastToNPC(), m, "0", 0);
}
if (m->IsClient()) { if (m->IsClient()) {
m->CastToClient()->DecrementAggroCount(); m->CastToClient()->DecrementAggroCount();