[Lua] Add IsImmuneToSpell Lua Mod (#4278)

* Add IsImmuneToSpell lua mod

* Add lua_parser.h include in spells.cpp
This commit is contained in:
Xackery 2024-04-28 05:20:34 -07:00 committed by GitHub
parent e268ab18f5
commit 39bb7e1723
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 76 additions and 0 deletions

View File

@ -40,6 +40,7 @@ void LuaMod::Init()
m_has_register_bug = parser_->HasFunction("RegisterBug", package_name_);
m_has_common_damage = parser_->HasFunction("CommonDamage", package_name_);
m_has_heal_damage = parser_->HasFunction("HealDamage", package_name_);
m_has_is_immune_to_spell = parser_->HasFunction("IsImmuneToSpell", package_name_);
}
void PutDamageHitInfo(lua_State *L, luabind::adl::object &e, DamageHitInfo &hit) {
@ -626,6 +627,58 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint64 &returnValu
}
}
void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
try {
if (!m_has_is_immune_to_spell) {
return;
}
lua_getfield(L, LUA_REGISTRYINDEX, package_name_.c_str());
lua_getfield(L, -1, "IsImmuneToSpell");
Lua_Mob l_self(self);
Lua_Mob l_other(caster);
luabind::adl::object e = luabind::newtable(L);
e["self"] = l_self;
e["caster"] = l_other;
e["spell_id"] = spell_id;
e.push(L);
if (lua_pcall(L, 1, 1, 0)) {
std::string error = lua_tostring(L, -1);
parser_->AddError(error);
lua_pop(L, 2);
return;
}
if (lua_type(L, -1) == LUA_TTABLE) {
luabind::adl::object ret(luabind::from_stack(L, -1));
auto ignore_default_obj = ret["ignore_default"];
if (luabind::type(ignore_default_obj) == LUA_TBOOLEAN) {
ignore_default = ignore_default || luabind::object_cast<bool>(ignore_default_obj);
}
auto return_value_obj = ret["return_value"];
if (luabind::type(return_value_obj) == LUA_TBOOLEAN) {
return_value = luabind::object_cast<bool>(return_value_obj);
}
}
}
catch (std::exception &ex) {
parser_->AddError(ex.what());
}
int end = lua_gettop(L);
int n = end - start;
if (n > 0) {
lua_pop(L, n);
}
}
void LuaMod::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault)
{
int start = lua_gettop(L);

View File

@ -26,6 +26,7 @@ public:
void TryCriticalHit(Mob *self, Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *opts, bool &ignoreDefault);
void GetRequiredAAExperience(Client *self, uint32 &returnValue, bool &ignoreDefault);
void GetEXPForLevel(Client *self, uint16 level, uint32 &returnValue, bool &ignoreDefault);
void IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default);
void GetExperienceForKill(Client *self, Mob *against, uint64 &returnValue, bool &ignoreDefault);
void CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault);
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
@ -49,4 +50,5 @@ private:
bool m_has_register_bug;
bool m_has_common_damage;
bool m_has_heal_damage;
bool m_has_is_immune_to_spell;
};

View File

@ -1602,6 +1602,15 @@ uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_
return retval;
}
bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &ignore_default)
{
bool retval = false;
for (auto &mod : mods_) {
mod.IsImmuneToSpell(self, caster, spell_id, retval, ignore_default);
}
return retval;
}
int64 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, bool &ignoreDefault)
{
int64 retval = 0;

View File

@ -201,6 +201,7 @@ public:
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
int64 CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default);
uint64 HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default);
bool IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &ignore_default);
private:
LuaParser();

View File

@ -84,6 +84,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
#include "string_ids.h"
#include "worldserver.h"
#include "fastmath.h"
#include "lua_parser.h"
#include <assert.h>
#include <algorithm>
@ -4958,6 +4959,16 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
LogSpells("Checking to see if we are immune to spell [{}] cast by [{}]", spell_id, caster->GetName());
#ifdef LUA_EQEMU
bool is_immune = false;
bool ignore_default = false;
is_immune = LuaParser::Instance()->IsImmuneToSpell(this, caster, spell_id, ignore_default);
if (ignore_default) {
return is_immune;
}
#endif
if(!IsValidSpell(spell_id))
return true;