diff --git a/zone/attack.cpp b/zone/attack.cpp index 6ffe44099..e2d7cdf17 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -1550,10 +1550,7 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts, boo hit.damage_done = 0; } - parse->EventBotMerc( - EVENT_USE_SKILL, - this, - nullptr, + parse->EventBotMerc(EVENT_USE_SKILL, this, nullptr, [&]() { return fmt::format( "{} {}", @@ -3078,10 +3075,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy std::vector args = { corpse }; - parse->EventMercNPC( - EVENT_DEATH_COMPLETE, - this, - owner_or_self, + parse->EventMercNPC(EVENT_DEATH_COMPLETE, this, owner_or_self, [&]() { return fmt::format( "{} {} {} {} {} {} {} {} {}", @@ -3096,8 +3090,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy m_combat_record.GetHealingReceived() ); }, - 0, - &args + 0, &args ); // Zone controller process EVENT_DEATH_ZONE (Death events) @@ -4266,10 +4259,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons if (attacker) { args = { this }; - parse->EventMob( - EVENT_DAMAGE_GIVEN, - attacker, - this, + parse->EventMob(EVENT_DAMAGE_GIVEN, attacker, this, [&]() { return fmt::format( "{} {} {} {} {} {} {} {} {}", @@ -4284,17 +4274,13 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons static_cast(special) ); }, - 0, - &args + 0, &args ); } args = { attacker }; - damage_override = parse->EventMob( - EVENT_DAMAGE_TAKEN, - this, - attacker, + damage_override = parse->EventMob(EVENT_DAMAGE_TAKEN, this, attacker, [&]() { return fmt::format( "{} {} {} {} {} {} {} {} {}", @@ -4309,8 +4295,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons static_cast(special) ); }, - 0, - &args + 0, &args ); if (damage_override > 0) { diff --git a/zone/bot.cpp b/zone/bot.cpp index bd077b456..68e0f561e 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -4192,14 +4192,7 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client* std::vector args = { return_iterator.return_item_instance }; - parse->EventBot( - EVENT_UNEQUIP_ITEM_BOT, - this, - nullptr, - export_string, - return_iterator.return_item_instance->GetID(), - &args - ); + parse->EventBot(EVENT_UNEQUIP_ITEM_BOT, this, nullptr, export_string, return_iterator.return_item_instance->GetID(), &args); } if (return_instance) { @@ -4264,14 +4257,7 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client* std::vector args = { trade_iterator.trade_item_instance }; - parse->EventBot( - EVENT_EQUIP_ITEM_BOT, - this, - nullptr, - export_string, - trade_iterator.trade_item_instance->GetID(), - &args - ); + parse->EventBot(EVENT_EQUIP_ITEM_BOT, this, nullptr, export_string, trade_iterator.trade_item_instance->GetID(), &args); } trade_iterator.trade_item_instance = nullptr; // actual deletion occurs in client delete below diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 14ee222f3..94d6756dd 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -3251,30 +3251,14 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) args.push_back(old_aug); if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) { - parse->EventItem( - EVENT_UNAUGMENT_ITEM, - this, - tobe_auged, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); } args.assign(1, tobe_auged); args.push_back(false); if (parse->ItemHasQuestSub(old_aug, EVENT_AUGMENT_REMOVE)) { - parse->EventItem( - EVENT_AUGMENT_REMOVE, - this, - old_aug, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_AUGMENT_REMOVE, this, old_aug, nullptr, "", in_augment->augment_index, &args); } if (parse->PlayerHasQuestSub(EVENT_AUGMENT_REMOVE_CLIENT)) { @@ -3306,29 +3290,13 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) args.push_back(aug); if (parse->ItemHasQuestSub(tobe_auged, EVENT_AUGMENT_ITEM)) { - parse->EventItem( - EVENT_AUGMENT_ITEM, - this, - tobe_auged, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_AUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); } args.assign(1, tobe_auged); if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_INSERT)) { - parse->EventItem( - EVENT_AUGMENT_INSERT, - this, - aug, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_AUGMENT_INSERT, this, aug, nullptr, "", in_augment->augment_index, &args); } args.push_back(aug); @@ -3398,30 +3366,14 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) args.push_back(aug); if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) { - parse->EventItem( - EVENT_UNAUGMENT_ITEM, - this, - tobe_auged, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); } args.assign(1, tobe_auged); args.push_back(false); if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_REMOVE)) { - parse->EventItem( - EVENT_AUGMENT_REMOVE, - this, - aug, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args); } args.push_back(aug); @@ -3486,30 +3438,14 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) args.push_back(aug); if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) { - parse->EventItem( - EVENT_UNAUGMENT_ITEM, - this, - tobe_auged, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); } args.assign(1, tobe_auged); args.push_back(true); if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_REMOVE)) { - parse->EventItem( - EVENT_AUGMENT_REMOVE, - this, - aug, - nullptr, - "", - in_augment->augment_index, - &args - ); + parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args); } args.push_back(aug); @@ -4479,14 +4415,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) int i = 0; if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) { - i = parse->EventItem( - EVENT_ITEM_CLICK_CAST, - this, - p_inst, - nullptr, - "", - castspell->inventoryslot - ); + i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot); } if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) { @@ -4518,14 +4447,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) int i = 0; if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) { - i = parse->EventItem( - EVENT_ITEM_CLICK_CAST, - this, - p_inst, - nullptr, - "", - castspell->inventoryslot - ); + i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot); } if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) { @@ -9591,14 +9513,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) int i = 0; if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) { - i = parse->EventItem( - EVENT_ITEM_CLICK_CAST, - this, - p_inst, - nullptr, - "", - slot_id - ); + i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", slot_id); } if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) { @@ -9662,14 +9577,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) int i = 0; if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) { - i = parse->EventItem( - EVENT_ITEM_CLICK_CAST, - this, - clickaug, - nullptr, - "", - slot_id - ); + i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, clickaug, nullptr, "", slot_id); } if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) { diff --git a/zone/entity.cpp b/zone/entity.cpp index 4a9a232ca..fab1be99f 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1817,25 +1817,13 @@ void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee) if (parse->PlayerHasQuestSub(EVENT_DUEL_WIN)) { std::vector args = { winner, loser }; - parse->EventPlayer( - EVENT_DUEL_WIN, - winner->CastToClient(), - loser->GetName(), - loser->CastToClient()->CharacterID(), - &args - ); + parse->EventPlayer(EVENT_DUEL_WIN, winner->CastToClient(), loser->GetName(), loser->CastToClient()->CharacterID(), &args); } if (parse->PlayerHasQuestSub(EVENT_DUEL_LOSE)) { std::vector args = { winner, loser }; - parse->EventPlayer( - EVENT_DUEL_LOSE, - loser->CastToClient(), - winner->GetName(), - winner->CastToClient()->CharacterID(), - &args - ); + parse->EventPlayer(EVENT_DUEL_LOSE, loser->CastToClient(), winner->GetName(), winner->CastToClient()->CharacterID(), &args); } } diff --git a/zone/mob.cpp b/zone/mob.cpp index c6c81629c..8e4219319 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -5325,14 +5325,7 @@ void Mob::ExecWeaponProc(const EQ::ItemInstance* inst, uint16 spell_id, Mob* on, //It should be safe as we don't have any truly const EQ::ItemInstance floating around anywhere. //So we'll live with it for now if (parse->ItemHasQuestSub(const_cast(inst), EVENT_WEAPON_PROC)) { - int i = parse->EventItem( - EVENT_WEAPON_PROC, - CastToClient(), - const_cast(inst), - on, - "", - spell_id - ); + int i = parse->EventItem(EVENT_WEAPON_PROC, CastToClient(), const_cast(inst), on, "", spell_id); if (i != 0) { return; diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 68bd859af..e1a859add 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -91,13 +91,7 @@ void QuestManager::Process() { if (cur->Timer_.Enabled() && cur->Timer_.Check()) { if (cur->mob) { if (cur->mob->IsEncounter()) { - parse->EventEncounter( - EVENT_TIMER, - cur->mob->CastToEncounter()->GetEncounterName(), - cur->name, - 0, - nullptr - ); + parse->EventEncounter(EVENT_TIMER, cur->mob->CastToEncounter()->GetEncounterName(), cur->name, 0, nullptr); } else { parse->EventMob(EVENT_TIMER, cur->mob, nullptr, [&]() { return cur->name; }, 0); } @@ -661,14 +655,7 @@ void QuestManager::stoptimer(const std::string& timer_name) for (auto e = QTimerList.begin(); e != QTimerList.end(); ++e) { if (e->mob && e->mob == owner && e->name == timer_name) { - parse->EventMob( - EVENT_TIMER_STOP, - owner, - nullptr, - [&]() { - return timer_name; - } - ); + parse->EventMob(EVENT_TIMER_STOP, owner, nullptr, [&]() { return timer_name; }); QTimerList.erase(e); break; @@ -695,14 +682,7 @@ void QuestManager::stoptimer(const std::string& timer_name, Mob* m) for (auto e = QTimerList.begin(); e != QTimerList.end();) { if (e->mob && e->mob == m) { - parse->EventMob( - EVENT_TIMER_STOP, - m, - nullptr, - [&]() { - return timer_name; - } - ); + parse->EventMob(EVENT_TIMER_STOP, m, nullptr, [&]() { return timer_name; }); QTimerList.erase(e); break; @@ -743,14 +723,7 @@ void QuestManager::stopalltimers() for (auto e = QTimerList.begin(); e != QTimerList.end();) { if (e->mob && e->mob == owner) { - parse->EventMob( - EVENT_TIMER_STOP, - owner, - nullptr, - [&]() { - return e->name; - } - ); + parse->EventMob(EVENT_TIMER_STOP, owner, nullptr, [&]() { return e->name; }); e = QTimerList.erase(e); } else { @@ -792,14 +765,7 @@ void QuestManager::stopalltimers(Mob* m) for (auto e = QTimerList.begin(); e != QTimerList.end();) { if (e->mob && e->mob == m) { - parse->EventMob( - EVENT_TIMER_STOP, - m, - nullptr, - [&]() { - return e->name; - } - ); + parse->EventMob(EVENT_TIMER_STOP, m, nullptr, [&]() { return e->name; }); e = QTimerList.erase(e); } else { @@ -853,18 +819,13 @@ void QuestManager::pausetimer(const std::string& timer_name, Mob* m) } ); - parse->EventMob( - EVENT_TIMER_PAUSE, - mob, - nullptr, - [&]() { - return fmt::format( - "{} {}", - timer_name, - milliseconds - ); - } - ); + parse->EventMob(EVENT_TIMER_PAUSE, mob, nullptr, [&]() { + return fmt::format( + "{} {}", + timer_name, + milliseconds + ); + }); LogQuests("Pausing timer [{}] for [{}] with [{}] ms remaining", timer_name, owner->GetName(), milliseconds); } diff --git a/zone/spells.cpp b/zone/spells.cpp index 7b644cd3a..15d1e5574 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -256,22 +256,15 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot, Mob* spell_target = entity_list.GetMobID(target_id); std::vector args = { spell_target }; - int return_value = parse->EventMob( - EVENT_CAST_BEGIN, - this, - nullptr, - [&]() { - return fmt::format( - "{} {} {} {}", - spell_id, - GetID(), - GetCasterLevel(spell_id), - target_id - ); - }, - 0, - &args - ); + int return_value = parse->EventMob(EVENT_CAST_BEGIN, this, nullptr, [&]() { + return fmt::format( + "{} {} {} {}", + spell_id, + GetID(), + GetCasterLevel(spell_id), + target_id + ); + }, 0, &args); if (IsClient() && return_value != 0) { if (IsDiscipline(spell_id)) { @@ -1804,22 +1797,15 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo std::vector args = { spell_target }; - parse->EventMob( - EVENT_CAST, - this, - nullptr, - [&]() { - return fmt::format( - "{} {} {} {}", - spell_id, - GetID(), - GetCasterLevel(spell_id), - target_id - ); - }, - 0, - &args - ); + parse->EventMob(EVENT_CAST, this, nullptr, [&]() { + return fmt::format( + "{} {} {} {}", + spell_id, + GetID(), + GetCasterLevel(spell_id), + target_id + ); + }, 0, &args); if(bard_song_mode) { @@ -3965,10 +3951,7 @@ bool Mob::SpellOnTarget( std::vector args = { spelltar }; - parse->EventMob( - EVENT_CAST_ON, - spelltar, - this, + parse->EventMob(EVENT_CAST_ON, spelltar, this, [&]() { return fmt::format( "{} {} {} {}", @@ -3978,8 +3961,7 @@ bool Mob::SpellOnTarget( target_id ); }, - 0, - &args + 0, &args ); if (!DoCastingChecksOnTarget(false, spell_id, spelltar)) {