Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

proc_ext function in Spells now includes InitialCaster as a fifth argument, eg function proc_ext(Caster, Target, Type, DamageType, InitialCaster)

Browse Source
This commit is contained in:
Emagi 2025-02-23 13:12:04 -05:00
parent 97a6405506
commit ae0b6c4b04
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/WorldServer/Combat.cpp
View File

@ -1679,6 +1679,7 @@ void Entity::AddProc(int8 type, float chance, Item* item, LuaSpell* spell, int8
MProcList.writelock(__FUNCTION__, __LINE__); MProcList.writelock(__FUNCTION__, __LINE__);
Proc* proc = new Proc(); Proc* proc = new Proc();
proc->initial_caster_entity_id = GetID();
proc->chance = chance; proc->chance = chance;
proc->item = item; proc->item = item;
proc->spell = spell; proc->spell = spell;
@ -1687,6 +1688,8 @@ void Entity::AddProc(int8 type, float chance, Item* item, LuaSpell* spell, int8
} }
if(spell && spell->spell) { if(spell && spell->spell) {
proc->spellid = spell->spell->GetSpellID(); proc->spellid = spell->spell->GetSpellID();
if(spell->caster)
proc->initial_caster_entity_id = spell->caster->GetID();
} }
proc->health_ratio = hp_ratio; proc->health_ratio = hp_ratio;
proc->below_health = below_health; proc->below_health = below_health;
@ -1756,6 +1759,10 @@ bool Entity::CastProc(Proc* proc, int8 type, Spawn* target) {
else { else {
lua_getglobal(state, "proc"); lua_getglobal(state, "proc");
} }
LogWrite(COMBAT__DEBUG, 0, "Proc", "CastProc%s ProcType %u for Caster/Entity %s, Target %s, spell %i tier %i, item script %s", proc->extended_version ? "Ext" : "", type, GetName(), (target != nullptr) ? target->GetName() : "MISSING_TARGET",
(proc->spell != nullptr) ? proc->spell->spell->GetSpellID() : -1, (proc->spell != nullptr) ? proc->spell->spell->GetSpellTier() : -1,
(proc->item != nullptr) ? proc->item->GetItemScript() : "NO_ITEM");
if (lua_isfunction(state, lua_gettop(state))) { if (lua_isfunction(state, lua_gettop(state))) {
if (item_proc) { if (item_proc) {
num_args++; num_args++;
@ -1768,6 +1775,16 @@ bool Entity::CastProc(Proc* proc, int8 type, Spawn* target) {
if(proc->extended_version) { if(proc->extended_version) {
lua_interface->SetInt32Value(state, proc->damage_type); lua_interface->SetInt32Value(state, proc->damage_type);
Spawn* initial_caster = nullptr;
if(proc->initial_caster_entity_id)
initial_caster = GetZone()->GetSpawnByID(proc->initial_caster_entity_id);
if(!initial_caster)
initial_caster = this;
lua_interface->SetSpawnValue(state, initial_caster);
} }
/* /*

1
source/WorldServer/Entity.h
View File

@ -1308,6 +1308,7 @@ struct Proc {
bool target_health; bool target_health;
int8 damage_type; int8 damage_type;
bool extended_version; bool extended_version;
int32 initial_caster_entity_id;
}; };
#define PROC_TYPE_OFFENSIVE 1 #define PROC_TYPE_OFFENSIVE 1