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

[Quest API] Add GetHateClosest() and GetHateListByDistance(distance) to Perl/Lua.

Browse Source
This commit is contained in:
Kinglykrab 2021-02-25 22:53:33 -05:00
parent 2957f5084d
commit 1af1b7bbdc
6 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/hate_list.cpp
View File

@ -785,3 +785,15 @@ void HateList::RemoveStaleEntries(int time_ms, float dist)
}
}
std::list<struct_HateList*> HateList::GetHateListByDistance(int distance)
{
std::list<struct_HateList*> hate_list;
int squared_distance = (distance * distance);
for (auto hate_iterator : list) {
auto hate_entry = hate_iterator->entity_on_hatelist;
if (distance == 0 || (distance > 0 && DistanceSquaredNoZ(hate_owner->GetPosition(), hate_entry->GetPosition()) <= squared_distance)) {
hate_list.push_back(hate_iterator);
}
}
return hate_list;
}

1
zone/hate_list.h
View File

@ -60,6 +60,7 @@ public:
int32 GetEntHateAmount(Mob *ent, bool in_damage = false);
std::list<struct_HateList*>& GetHateList() { return list; }
std::list<struct_HateList*> GetHateListByDistance(int distance = 0);
void AddEntToHateList(Mob *ent, int32 in_hate = 0, int32 in_damage = 0, bool in_is_frenzied = false, bool add_to_hate_list_if_not_exist = true);
void DoFactionHits(int32 npc_faction_level_id);

31
zone/lua_mob.cpp
View File

@ -2309,6 +2309,34 @@ void Lua_Mob::SetBucket(std::string bucket_name, std::string bucket_value, std::
self->SetBucket(bucket_name, bucket_value, expiration);
}
Lua_Mob Lua_Mob::GetHateClosest() {
Lua_Safe_Call_Class(Lua_Mob);
return Lua_Mob(self->GetHateClosest());
}
Lua_HateList Lua_Mob::GetHateListByDistance() {
Lua_Safe_Call_Class(Lua_HateList);
Lua_HateList ret;
auto list = self->GetHateListByDistance();
for (auto hate_entry : list) {
Lua_HateEntry entry(hate_entry);
ret.entries.push_back(entry);
}
return ret;
}
Lua_HateList Lua_Mob::GetHateListByDistance(int distance) {
Lua_Safe_Call_Class(Lua_HateList);
Lua_HateList ret;
auto list = self->GetHateListByDistance(distance);
for (auto hate_entry : list) {
Lua_HateEntry entry(hate_entry);
ret.entries.push_back(entry);
}
return ret;
}
luabind::scope lua_register_mob() {
return luabind::class_<Lua_Mob, Lua_Entity>("Mob")
.def(luabind::constructor<>())
@ -2475,9 +2503,12 @@ luabind::scope lua_register_mob() {
.def("GetPet", &Lua_Mob::GetPet)
.def("GetOwner", &Lua_Mob::GetOwner)
.def("GetHateList", &Lua_Mob::GetHateList)
.def("GetHateListByDistance", (Lua_HateList(Lua_Mob::*)(void))&Lua_Mob::GetHateListByDistance)
.def("GetHateListByDistance", (Lua_HateList(Lua_Mob::*)(int))&Lua_Mob::GetHateListByDistance)
.def("GetHateTop", (Lua_Mob(Lua_Mob::*)(void))&Lua_Mob::GetHateTop)
.def("GetHateDamageTop", (Lua_Mob(Lua_Mob::*)(Lua_Mob))&Lua_Mob::GetHateDamageTop)
.def("GetHateRandom", (Lua_Mob(Lua_Mob::*)(void))&Lua_Mob::GetHateRandom)
.def("GetHateClosest", &Lua_Mob::GetHateClosest)
.def("AddToHateList", (void(Lua_Mob::*)(Lua_Mob))&Lua_Mob::AddToHateList)
.def("AddToHateList", (void(Lua_Mob::*)(Lua_Mob,int))&Lua_Mob::AddToHateList)
.def("AddToHateList", (void(Lua_Mob::*)(Lua_Mob,int,int))&Lua_Mob::AddToHateList)

3
zone/lua_mob.h
View File

@ -198,9 +198,12 @@ public:
Lua_Mob GetPet();
Lua_Mob GetOwner();
Lua_HateList GetHateList();
Lua_HateList GetHateListByDistance();
Lua_HateList GetHateListByDistance(int distance);
Lua_Mob GetHateTop();
Lua_Mob GetHateDamageTop(Lua_Mob other);
Lua_Mob GetHateRandom();
Lua_Mob GetHateClosest();
void AddToHateList(Lua_Mob other);
void AddToHateList(Lua_Mob other, int hate);
void AddToHateList(Lua_Mob other, int hate, int damage);

2
zone/mob.h
View File

@ -642,6 +642,7 @@ public:
Mob* GetHateDamageTop(Mob* other) { return hate_list.GetDamageTopOnHateList(other);}
Mob* GetHateRandom() { return hate_list.GetRandomEntOnHateList();}
Mob* GetHateMost() { return hate_list.GetEntWithMostHateOnList();}
Mob* GetHateClosest() { return hate_list.GetClosestEntOnHateList(this); }
bool IsEngaged() { return(!hate_list.IsHateListEmpty()); }
bool HasPrimaryAggro() { return PrimaryAggro; }
bool HasAssistAggro() { return AssistAggro; }
@ -656,6 +657,7 @@ public:
bool IsOnFeignMemory(Client *attacker) const;
void PrintHateListToClient(Client *who) { hate_list.PrintHateListToClient(who); }
std::list<struct_HateList*>& GetHateList() { return hate_list.GetHateList(); }
std::list<struct_HateList*> GetHateListByDistance(int distance = 0) { return hate_list.GetHateListByDistance(distance); }
bool CheckLosFN(Mob* other);
bool CheckLosFN(float posX, float posY, float posZ, float mobSize);
static bool CheckLosFN(glm::vec3 posWatcher, float sizeWatcher, glm::vec3 posTarget, float sizeTarget);

41
zone/perl_mob.cpp
View File

@ -6179,6 +6179,45 @@ XS(XS_Mob_SetBucket) {
XSRETURN_EMPTY;
}
XS(XS_Mob_GetHateListByDistance); /* prototype to pass -Wmissing-prototypes */
XS(XS_Mob_GetHateListByDistance) {
dXSARGS;
int num_entries = 0;
if (items < 1 || items > 2)
Perl_croak(aTHX_ "Usage: Mob::GetHateListByDistance(THIS, int distance)"); // @categories Hate and Aggro
{
Mob *THIS;
int distance = 0;
VALIDATE_THIS_IS_MOB;
if (items == 2)
distance = (int) SvIV(ST(1));
auto list = THIS->GetHateListByDistance(distance);
for (auto hate_entry : list) {
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "HateEntry", (void *) hate_entry);
XPUSHs(ST(0));
num_entries++;
}
}
XSRETURN(num_entries);
}
XS(XS_Mob_GetHateClosest); /* prototype to pass -Wmissing-prototypes */
XS(XS_Mob_GetHateClosest) {
dXSARGS;
if (items != 1)
Perl_croak(aTHX_ "Usage: Mob::GetHateClosest(THIS)"); // @categories Hate and Aggro
{
Mob *THIS;
Mob *closest_mob;
VALIDATE_THIS_IS_MOB;
closest_mob = THIS->GetHateClosest();
ST(0) = sv_newmortal();
sv_setref_pv(ST(0), "Mob", (void *) closest_mob);
}
XSRETURN(1);
}
#ifdef __cplusplus
extern "C"
@ -6525,6 +6564,8 @@ XS(boot_Mob) {
newXSproto(strcpy(buf, "GetBucketKey"), XS_Mob_GetBucketKey, file, "$");
newXSproto(strcpy(buf, "GetBucketRemaining"), XS_Mob_GetBucketRemaining, file, "$$");
newXSproto(strcpy(buf, "SetBucket"), XS_Mob_SetBucket, file, "$$$;$");
newXSproto(strcpy(buf, "GetHateClosest"), XS_Mob_GetHateClosest, file, "$");
newXSproto(strcpy(buf, "GetHateListByDistance"), XS_Mob_GetHateListByDistance, file, "$;$");
XSRETURN_YES;
}