pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New BazaarSearch query routine

Browse Source
This commit is contained in:
Mitch Freeman
2025-04-13 09:48:38 -03:00
parent 8f79ce25de
commit 116040914c
7 changed files with 165 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+1 -1
View File
@@ -15456,7 +15456,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
break;
}
default: {
LogTrading("Unknown size for OP_Trader: [{}]\n", app->size);
//LogTradingDetail("Unknown size for OP_Trader: [{}]", app->size);
}
}
}
zone/trading.cpp
+32 -13
View File
@@ -1399,8 +1399,20 @@ static void BazaarAuditTrail(const char *seller, const char *buyer, const char *
void Client::BuyTraderItem(const EQApplicationPacket *app)
{
auto in = reinterpret_cast<TraderBuy_Struct *>(app->pBuffer);
auto trader = entity_list.GetClientByID(in->trader_id);
struct Checks {
bool take_customer_money {false};
bool give_trader_money {false};
bool give_customer_item {false};
bool take_trader_item {false};
uint64 customer_money {false};
uint64 trader_money {false};
EQ::ItemInstance *trader_item {nullptr};
EQ::ItemInstance *customer_item {nullptr};
};
Checks checks{};
auto in = reinterpret_cast<TraderBuy_Struct *>(app->pBuffer);
auto trader = entity_list.GetClientByID(in->trader_id);
if (!trader || !trader->IsTrader()) {
Message(Chat::Red, "The trader could not be found.");
@@ -1436,6 +1448,8 @@ void Client::BuyTraderItem(const EQApplicationPacket *app)
if (CheckLoreConflict(inst_copy->GetItem())) {
MessageString(Chat::Red, DUPLICATE_LORE);
in->method = BazaarByParcel;
in->sub_action = DataOutDated;
TradeRequestFailed(app);
return;
}
@@ -1474,6 +1488,7 @@ void Client::BuyTraderItem(const EQApplicationPacket *app)
TradeRequestFailed(app);
return;
}
checks.take_customer_money = true;
if (!trader->RemoveItemByItemUniqueId(buy_inst->GetUniqueID(), quantity)) {
AddMoneyToPP(total_cost, true);
@@ -1481,8 +1496,10 @@ void Client::BuyTraderItem(const EQApplicationPacket *app)
TradeRequestFailed(app);
return;
}
checks.take_trader_item = true;
trader->AddMoneyToPP(total_cost, true);
checks.give_trader_money = true;
if (!PutItemInInventoryWithStacking(inst_copy.get())) {
AddMoneyToPP(total_cost, true);
@@ -1492,6 +1509,7 @@ void Client::BuyTraderItem(const EQApplicationPacket *app)
TradeRequestFailed(app);
return;
}
checks.give_customer_item = true;
auto [slot_id, merchant_data] = GetDataFromMerchantListByItemUniqueId(buy_inst->GetUniqueID());
auto [item_id, merchant_quantity, item_unique_id] = merchant_data;
@@ -2576,21 +2594,22 @@ void Client::TraderUpdateItem(const EQApplicationPacket *app)
}
}
else {
for (auto const i : result) {
auto [slot_id, merchant_data] = customer->GetDataFromMerchantListByItemUniqueId(i.item_unique_id);
auto [item_id, merchant_quantity, item_unique_id] = merchant_data;
std::unique_ptr<EQ::ItemInstance> vendor_inst_copy(inst ? inst->Clone() : nullptr);
vendor_inst_copy->SetUniqueID(i.item_unique_id);
vendor_inst_copy->SetMerchantCount(i.item_charges);
vendor_inst_copy->SetMerchantSlot(slot_id);
vendor_inst_copy->SetPrice(new_price);
customer->SendItemPacket(slot_id, vendor_inst_copy.get(), ItemPacketMerchant);
}
if (customer) {
for (auto const i : result) {
auto [slot_id, merchant_data] = customer->GetDataFromMerchantListByItemUniqueId(i.item_unique_id);
auto [item_id, merchant_quantity, item_unique_id] = merchant_data;
std::unique_ptr<EQ::ItemInstance> vendor_inst_copy(inst ? inst->Clone() : nullptr);
vendor_inst_copy->SetUniqueID(i.item_unique_id);
vendor_inst_copy->SetMerchantCount(i.item_charges);
vendor_inst_copy->SetMerchantSlot(slot_id);
vendor_inst_copy->SetPrice(new_price);
customer->SendItemPacket(slot_id, vendor_inst_copy.get(), ItemPacketMerchant);
}
customer->Message(
Chat::Red,
fmt::format("Trader {} updated the price of item {}", GetCleanName(), inst->GetItem()->Name).c_str()
);
}
}
in->sub_action = BazaarPriceChange_UpdatePrice;