pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add Buff infrastructure to go through different logic paths from different patches (#5073)
Build / Linux (push) Waiting to run
Details
Build / Windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
dannuic
2026-05-02 22:53:26 -06:00
committed by GitHub
parent c253734c57
commit 18df055f16
201 changed files with 2856 additions and 3105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_parser.cpp
+9 -9
View File
@@ -757,7 +757,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
return 0;
}
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@@ -773,7 +773,7 @@ int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spe
return _EventSpell(package_name, evt, mob, client, spell_id, data, extra_data, extra_pointers);
}
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers, luabind::adl::object *l_func) {
const char *sub_name = LuaEvents[evt];
@@ -959,7 +959,7 @@ bool LuaParser::GlobalPlayerHasQuestSub(QuestEventID evt) {
return HasFunction(subname, "global_player");
}
bool LuaParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) {
bool LuaParser::SpellHasQuestSub(int32 spell_id, QuestEventID evt) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
return false;
@@ -1026,7 +1026,7 @@ void LuaParser::LoadItemScript(std::string filename, EQ::ItemInstance *item) {
LoadScript(filename, package_name);
}
void LuaParser::LoadSpellScript(std::string filename, uint32 spell_id) {
void LuaParser::LoadSpellScript(std::string filename, int32 spell_id) {
std::string package_name = "spell_" + std::to_string(spell_id);
LoadScript(filename, package_name);
@@ -1533,7 +1533,7 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInsta
return ret;
}
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@@ -1675,7 +1675,7 @@ uint64 LuaParser::GetExperienceForKill(Client *self, Mob *against, bool &ignoreD
}
int64 LuaParser::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)
int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default)
{
int64 retval = 0;
for (auto &mod : mods_) {
@@ -1684,7 +1684,7 @@ int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spel
return retval;
}
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default)
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, bool &ignore_default)
{
uint64 retval = 0;
for (auto &mod : mods_) {
@@ -1693,7 +1693,7 @@ 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 LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, int32 spell_id, bool &ignore_default)
{
bool retval = false;
for (auto &mod : mods_) {
@@ -1702,7 +1702,7 @@ bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &i
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 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, bool &ignoreDefault)
{
int64 retval = 0;
for (auto &mod : mods_) {