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

[Quest API] Add BuffCount() Overloads to Perl/Lua. (#2679)

Browse Source 
# Perl
- Add `$mob->BuffCount(is_beneficial)`.
- Add `$mob->BuffCount(is_beneficial, is_detrimental)`.

# Lua
- Add `mob:BuffCount(is_beneficial)`.
- Add `mob:BuffCount(is_beneficial, is_detrimental)`.

 # Notes
- Allows operators to count only beneficial or detrimental buffs a mob has instead of always counting all buffs.
This commit is contained in:
Alex King 2022-12-29 11:58:38 -05:00 committed by GitHub
parent a590ea1d52
commit 7e7485be77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/lua_mob.cpp
View File

@ -323,11 +323,6 @@ uint16 Lua_Mob::FindBuffBySlot(int slot) {
return self->FindBuffBySlot(slot);
}
uint32 Lua_Mob::BuffCount() {
Lua_Safe_Call_Int();
return self->BuffCount();
}
bool Lua_Mob::FindType(int type) {
Lua_Safe_Call_Bool();
return self->FindType(type);
@ -2757,6 +2752,21 @@ bool Lua_Mob::IsAttackAllowed(Lua_Mob target, bool is_spell_attack) {
return self->IsAttackAllowed(target, is_spell_attack);
}
uint32 Lua_Mob::BuffCount() {
Lua_Safe_Call_Int();
return self->BuffCount();
}
uint32 Lua_Mob::BuffCount(bool is_beneficial) {
Lua_Safe_Call_Int();
return self->BuffCount(is_beneficial);
}
uint32 Lua_Mob::BuffCount(bool is_beneficial, bool is_detrimental) {
Lua_Safe_Call_Int();
return self->BuffCount(is_beneficial, is_detrimental);
}
#ifdef BOTS
void Lua_Mob::DamageAreaBots(int64 damage) {
Lua_Safe_Call_Void();
@ -2848,7 +2858,9 @@ luabind::scope lua_register_mob() {
.def("BehindMob", (bool(Lua_Mob::*)(Lua_Mob,float))&Lua_Mob::BehindMob)
.def("BehindMob", (bool(Lua_Mob::*)(Lua_Mob,float,float))&Lua_Mob::BehindMob)
.def("BehindMob", (bool(Lua_Mob::*)(void))&Lua_Mob::BehindMob)
.def("BuffCount", &Lua_Mob::BuffCount)
.def("BuffCount", (uint32(Lua_Mob::*)(void))&Lua_Mob::BuffCount)
.def("BuffCount", (uint32(Lua_Mob::*)(bool))&Lua_Mob::BuffCount)
.def("BuffCount", (uint32(Lua_Mob::*)(bool,bool))&Lua_Mob::BuffCount)
.def("BuffFadeAll", (void(Lua_Mob::*)(void))&Lua_Mob::BuffFadeAll)
.def("BuffFadeByEffect", (void(Lua_Mob::*)(int))&Lua_Mob::BuffFadeByEffect)
.def("BuffFadeByEffect", (void(Lua_Mob::*)(int,int))&Lua_Mob::BuffFadeByEffect)

2
zone/lua_mob.h
View File

@ -94,6 +94,8 @@ public:
bool FindBuff(int spell_id);
uint16 FindBuffBySlot(int slot);
uint32 BuffCount();
uint32 BuffCount(bool is_beneficial);
uint32 BuffCount(bool is_beneficial, bool is_detrimental);
bool FindType(int type);
bool FindType(int type, bool offensive);
bool FindType(int type, bool offensive, int threshold);

2
zone/mob.h
View File

@ -443,7 +443,7 @@ public:
int32 RuneAbsorb(int64 damage, uint16 type);
bool FindBuff(uint16 spell_id);
uint16 FindBuffBySlot(int slot);
uint32 BuffCount();
uint32 BuffCount(bool is_beneficial = true, bool is_detrimental = true);
bool FindType(uint16 type, bool bOffensive = false, uint16 threshold = 100);
int16 GetBuffSlotFromType(uint16 type);
uint16 GetSpellIDFromSlot(uint8 slot);

24
zone/perl_mob.cpp
View File

@ -338,11 +338,6 @@ int Perl_Mob_FindBuffBySlot(Mob* self, int slot) // @categories Spells and Disci
return self->FindBuffBySlot(slot);
}
int Perl_Mob_BuffCount(Mob* self) // @categories Script Utility, Spells and Disciplines
{
return self->BuffCount();
}
bool Perl_Mob_FindType(Mob* self, uint16_t type) // @categories Script Utility
{
return self->FindType(type);
@ -2703,6 +2698,21 @@ bool Perl_Mob_IsAttackAllowed(Mob* self, Mob* target, bool is_spell_attack)
return self->IsAttackAllowed(target, is_spell_attack);
}
uint32 Perl_Mob_BuffCount(Mob* self) // @categories Script Utility, Spells and Disciplines
{
return self->BuffCount();
}
uint32 Perl_Mob_BuffCount(Mob* self, bool is_beneficial) // @categories Script Utility, Spells and Disciplines
{
return self->BuffCount(is_beneficial);
}
uint32 Perl_Mob_BuffCount(Mob* self, bool is_beneficial, bool is_detrimental) // @categories Script Utility, Spells and Disciplines
{
return self->BuffCount(is_beneficial, is_detrimental);
}
#ifdef BOTS
void Perl_Mob_DamageAreaBots(Mob* self, int64 damage) // @categories Hate and Aggro
{
@ -2801,7 +2811,9 @@ void perl_register_mob()
package.add("BehindMob", (bool(*)(Mob*, Mob*))&Perl_Mob_BehindMob);
package.add("BehindMob", (bool(*)(Mob*, Mob*, float))&Perl_Mob_BehindMob);
package.add("BehindMob", (bool(*)(Mob*, Mob*, float, float))&Perl_Mob_BehindMob);
package.add("BuffCount", &Perl_Mob_BuffCount);
package.add("BuffCount", (uint32(*)(Mob*))&Perl_Mob_BuffCount);
package.add("BuffCount", (uint32(*)(Mob*, bool))&Perl_Mob_BuffCount);
package.add("BuffCount", (uint32(*)(Mob*, bool, bool))&Perl_Mob_BuffCount);
package.add("BuffFadeAll", &Perl_Mob_BuffFadeAll);
package.add("BuffFadeByEffect", (void(*)(Mob*, int))&Perl_Mob_BuffFadeByEffect);
package.add("BuffFadeByEffect", (void(*)(Mob*, int, int))&Perl_Mob_BuffFadeByEffect);

11
zone/spells.cpp
View File

@ -4369,11 +4369,18 @@ uint16 Mob::FindBuffBySlot(int slot) {
return 0;
}
uint32 Mob::BuffCount() {
uint32 Mob::BuffCount(bool is_beneficial, bool is_detrimental) {
uint32 active_buff_count = 0;
int buff_count = GetMaxTotalSlots();
for (int buff_slot = 0; buff_slot < buff_count; buff_slot++) {
if (IsValidSpell(buffs[buff_slot].spellid)) {
const auto is_spell_beneficial = IsBeneficialSpell(buffs[buff_slot].spellid);
if (
IsValidSpell(buffs[buff_slot].spellid) &&
(
(is_beneficial && is_spell_beneficial) ||
(is_detrimental && !is_spell_beneficial)
)
) {
active_buff_count++;
}
}