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

[Quest API] (Performance) Check merchant events exist before export and execute (#2893)

Browse Source 
* [Quest API] Optionally parse merchant events

- Optionally parse these events instead of always doing so.

* Cleanup
This commit is contained in:
Alex King 2023-02-13 00:33:32 -05:00 committed by GitHub
parent 3474c00e7a
commit 21e42714eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
zone/client_packet.cpp
View File

@ -2596,15 +2596,18 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app)
QServ->PlayerLogEvent(Player_Log_Alternate_Currency_Transactions, CharacterID(), event_desc); QServ->PlayerLogEvent(Player_Log_Alternate_Currency_Transactions, CharacterID(), event_desc);
} }
const auto& export_string = fmt::format( if (parse->PlayerHasQuestSub(EVENT_ALT_CURRENCY_MERCHANT_BUY)) {
"{} {} {} {} {}", const auto& export_string = fmt::format(
alt_cur_id, "{} {} {} {} {}",
tar->GetNPCTypeID(), alt_cur_id,
tar->MerchantType, tar->GetNPCTypeID(),
item->ID, tar->MerchantType,
cost item->ID,
); cost
parse->EventPlayer(EVENT_ALT_CURRENCY_MERCHANT_BUY, this, export_string, 0); );
parse->EventPlayer(EVENT_ALT_CURRENCY_MERCHANT_BUY, this, export_string, 0);
}
uint64 current_balance = AddAlternateCurrencyValue(alt_cur_id, -((int32) cost)); uint64 current_balance = AddAlternateCurrencyValue(alt_cur_id, -((int32) cost));
int16 charges = 1; int16 charges = 1;
@ -2787,15 +2790,18 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app)
QServ->PlayerLogEvent(Player_Log_Alternate_Currency_Transactions, CharacterID(), event_desc); QServ->PlayerLogEvent(Player_Log_Alternate_Currency_Transactions, CharacterID(), event_desc);
} }
const auto& export_string = fmt::format( if (parse->PlayerHasQuestSub(EVENT_ALT_CURRENCY_MERCHANT_SELL)) {
"{} {} {} {} {}", const auto& export_string = fmt::format(
alt_cur_id, "{} {} {} {} {}",
tar->GetNPCTypeID(), alt_cur_id,
tar->MerchantType, tar->GetNPCTypeID(),
item->ID, tar->MerchantType,
cost item->ID,
); cost
parse->EventPlayer(EVENT_ALT_CURRENCY_MERCHANT_SELL, this, export_string, 0); );
parse->EventPlayer(EVENT_ALT_CURRENCY_MERCHANT_SELL, this, export_string, 0);
}
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
uint64 new_balance = AddAlternateCurrencyValue(alt_cur_id, cost); uint64 new_balance = AddAlternateCurrencyValue(alt_cur_id, cost);
@ -13575,16 +13581,19 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
safe_delete(qspack); safe_delete(qspack);
} }
// end QS code // end QS code
if (parse->PlayerHasQuestSub(EVENT_MERCHANT_BUY)) {
const auto& export_string = fmt::format(
"{} {} {} {} {}",
tmp->GetNPCTypeID(),
tmp->CastToNPC()->MerchantType,
item_id,
mpo->quantity,
mpo->price
);
const auto& export_string = fmt::format( parse->EventPlayer(EVENT_MERCHANT_BUY, this, export_string, 0);
"{} {} {} {} {}", }
tmp->GetNPCTypeID(),
tmp->CastToNPC()->MerchantType,
item_id,
mpo->quantity,
mpo->price
);
parse->EventPlayer(EVENT_MERCHANT_BUY, this, export_string, 0);
if (player_event_logs.IsEventEnabled(PlayerEvent::MERCHANT_PURCHASE)) { if (player_event_logs.IsEventEnabled(PlayerEvent::MERCHANT_PURCHASE)) {
auto e = PlayerEvent::MerchantPurchaseEvent{ auto e = PlayerEvent::MerchantPurchaseEvent{
@ -13772,15 +13781,18 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
} }
// end QS code // end QS code
const auto& export_string = fmt::format( if (parse->PlayerHasQuestSub(EVENT_MERCHANT_SELL)) {
"{} {} {} {} {}", const auto& export_string = fmt::format(
vendor->GetNPCTypeID(), "{} {} {} {} {}",
vendor->CastToNPC()->MerchantType, vendor->GetNPCTypeID(),
itemid, vendor->CastToNPC()->MerchantType,
mp->quantity, itemid,
price mp->quantity,
); price
parse->EventPlayer(EVENT_MERCHANT_SELL, this, export_string, 0); );
parse->EventPlayer(EVENT_MERCHANT_SELL, this, export_string, 0);
}
if (player_event_logs.IsEventEnabled(PlayerEvent::MERCHANT_SELL)) { if (player_event_logs.IsEventEnabled(PlayerEvent::MERCHANT_SELL)) {
auto e = PlayerEvent::MerchantSellEvent{ auto e = PlayerEvent::MerchantSellEvent{