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

[Quest API] Export $killed_npc to EVENT_NPC_SLAY to Perl (#2879)

Browse Source 
# Notes
- Exports `$killed_npc` to `EVENT_NPC_SLAY` to Perl.
- Allows operators to use NPC reference in event instead of just NPC ID.
This commit is contained in:
Alex King 2023-02-12 23:49:16 -05:00 committed by GitHub
parent 3813162bac
commit c64591b8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/attack.cpp
View File

@ -2790,7 +2790,10 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
} }
if (oos->IsNPC()) { if (oos->IsNPC()) {
parse->EventNPC(EVENT_NPC_SLAY, oos->CastToNPC(), this, "", 0); if (parse->HasQuestSub(oos->GetNPCTypeID(), EVENT_NPC_SLAY)) {
parse->EventNPC(EVENT_NPC_SLAY, oos->CastToNPC(), this, "", 0);
}
auto emote_id = oos->GetEmoteID(); auto emote_id = oos->GetEmoteID();
if (emote_id) { if (emote_id) {
oos->CastToNPC()->DoNPCEmote(EQ::constants::EmoteEventTypes::KilledNPC, emote_id); oos->CastToNPC()->DoNPCEmote(EQ::constants::EmoteEventTypes::KilledNPC, emote_id);
@ -2801,7 +2804,10 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
} }
if (killer_mob && killer_mob->IsBot()) { if (killer_mob && killer_mob->IsBot()) {
parse->EventBot(EVENT_NPC_SLAY, killer_mob->CastToBot(), this, "", 0); if (parse->BotHasQuestSub(EVENT_NPC_SLAY)) {
parse->EventBot(EVENT_NPC_SLAY, killer_mob->CastToBot(), this, "", 0);
}
killer_mob->TrySpellOnKill(killed_level, spell); killer_mob->TrySpellOnKill(killed_level, spell);
} }

1
zone/embparser.cpp
View File

@ -1591,6 +1591,7 @@ void PerlembParser::ExportEventVariables(
case EVENT_NPC_SLAY: { case EVENT_NPC_SLAY: {
ExportVar(package_name.c_str(), "killed", mob->GetNPCTypeID()); ExportVar(package_name.c_str(), "killed", mob->GetNPCTypeID());
ExportVar(package_name.c_str(), "killed_npc", "NPC", mob->CastToNPC());
break; break;
} }