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

wip

Browse Source
This commit is contained in:
Mitch Freeman 2025-04-19 21:22:48 -03:00
parent 898a26d4e5
commit d87d1dfb1d
2 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zone/trading.cpp
View File

@ -2860,7 +2860,6 @@ void Client::BuyTraderItemFromBazaarWindow(const EQApplicationPacket *app)
charges = trader_item.item_charges;
}
LogTrading("Name: [{}] Requested Quantity: [{}] Charges: [{}]", in->item_name, quantity, charges);
LogTradingDetail(
"Step 1:Bazaar Purchase. Buyer [{}] Seller [{}] Quantity [{}] Charges [{}] Item_Unique_ID [{}]",
CharacterID(),
@ -2892,8 +2891,15 @@ void Client::BuyTraderItemFromBazaarWindow(const EQApplicationPacket *app)
}
Message(Chat::Red, fmt::format("You paid {} for the parcel delivery.", DetermineMoneyString(fee)).c_str());
LogTrading("Customer [{}] Paid: [{}] to trader [{}]", CharacterID(), DetermineMoneyString(total_cost), trader_item.character_id);
LogTradingDetail("Step 2:Bazaar Purchase. Took [{}] from Buyer [{}] ", DetermineMoneyString(total_cost), CharacterID());
SendMoneyUpdate();
LogTradingDetail("Step 2:Bazaar Purchase. Took [{}] from Buyer [{}] for purchase of [{}] {}{}",
DetermineMoneyString(total_cost),
CharacterID(),
quantity,
quantity > 1 ? fmt::format("{}s", in->item_name) : in->item_name,
item->MaxCharges > 0 ? fmt::format(" with charges of [{}]", charges) : std::string("")
);
auto out_server = std::make_unique<ServerPacket>(ServerOP_BazaarPurchase, sizeof(BazaarPurchaseMessaging_Struct));
auto out_data = reinterpret_cast<BazaarPurchaseMessaging_Struct *>(out_server->pBuffer);
@ -2931,7 +2937,7 @@ void Client::BuyTraderItemFromBazaarWindow(const EQApplicationPacket *app)
);
worldserver.SendPacket(out_server.get());
LogTradingDetail("Step 5:Bazaar Purchase. Send bazaar messaging data to world.\n"
LogTradingDetail("Step 3:Bazaar Purchase. Buyer checks passed, sending bazaar messaging data to trader via world.\n"
"Action: {} \n"
"Sub Action: {} \n"
"Method: {} \n"
@ -2978,9 +2984,6 @@ void Client::BuyTraderItemFromBazaarWindow(const EQApplicationPacket *app)
out_data->trader_zone_instance_id,
out_data->buyer_id,
out_data->trader_buy_struct.buyer_name);
SendMoneyUpdate();
LogTradingDetail("Step 6:Bazaar Purchase. Send money update to client {}. Buyer Actions complete.", CharacterID());
}
void Client::SetBuyerWelcomeMessage(const char *welcome_message)

78
zone/worldserver.cpp
View File

@ -3780,9 +3780,11 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
auto trader_pc = entity_list.GetClientByCharID(in->trader_buy_struct.trader_id);
if (!trader_pc) {
LogTrading(
"Request trader_id <red>[{}] could not be found in zone_id <red>[{}]",
"Request trader_id [{}] could not be found in zone_id [{}] instance_id [{}]",
in->trader_buy_struct.trader_id,
zone->GetZoneID());
zone->GetZoneID(),
zone->GetInstanceID()
);
return;
}
@ -3806,19 +3808,19 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (item->IsStackable() && in->item_quantity != in->item_charges) {
TraderRepository::UpdateQuantity(database, in->trader_buy_struct.item_unique_id, item->GetCharges() - in->item_quantity);
LogTradingDetail(
"Step 4a:Bazaar Purchase. Decreased database id {} from [{}] to [{}] charges",
"Step 4:Bazaar Purchase. Decreased database id {} from [{}] to [{}] charges",
in->trader_buy_struct.item_id,
in->item_charges,
in->item_charges
item->GetCharges(),
item->GetCharges() - in->item_quantity
);
}
else {
TraderRepository::DeleteOne(database, in->trader_buy_struct.item_id);
LogTradingDetail(
"Step 4b:Bazaar Purchase. Deleted database id [{}] because database quantity [{}] equals [{}] purchased quantity",
"Step 4:Bazaar Purchase. Deleted database id [{}] because database quantity [{}] equals [{}] purchased quantity",
in->trader_buy_struct.item_id,
in->item_charges,
in->item_charges
item->GetCharges(),
item->GetCharges() - in->item_quantity
);
}
@ -3826,12 +3828,28 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
//perform actions to trader
uint64 total_cost = static_cast<uint64>(in->trader_buy_struct.price) * static_cast<uint64>(in->item_quantity);
if (!trader_pc->RemoveItemByItemUniqueId(in->trader_buy_struct.item_unique_id, in->item_quantity)) {
LogTradingDetail(
"Failed to remove item {} quantity [{}] from trader [{}]",
in->trader_buy_struct.item_unique_id,
in->item_quantity,
trader_pc->CharacterID()
);
in->transaction_status = BazaarPurchaseTraderFailed;
TraderRepository::UpdateActiveTransaction(database, in->id, false);
worldserver.SendPacket(pack);
break;
}
LogTradingDetail(
"Step 5:Bazaar Purchase. Removed from inventory of Trader [{}] for sale of [{}] {}{}",
trader_pc->CharacterID(),
in->item_quantity,
in->item_quantity > 1 ? fmt::format("{}s", in->trader_buy_struct.item_name)
: in->trader_buy_struct.item_name,
item->GetItem()->MaxCharges > 0 ? fmt::format(" with charges of [{}]", in->item_charges)
: std::string("")
);
trader_pc->AddMoneyToPP(total_cost, true);
//Update the trader to indicate the sale has completed
@ -3866,6 +3884,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
TraderRepository::UpdateActiveTransaction(database, in->id, false);
worldserver.SendPacket(pack);
LogTradingDetail("Step 6:Bazaar Purchase. Purchase checks complete for trader. Send Success to buyer via world.");
break;
}
case BazaarPurchaseTraderFailed: {
@ -3887,6 +3907,9 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
buyer->AddMoneyToPP(total_cost + fee, false);
buyer->SendMoneyUpdate();
buyer->Message(Chat::Red, "Bazaar purchased failed. Returning your money.");
LogTradingDetail("Bazaar Purchase Failed. Returning money [{}] to Buyer [{}]", total_cost + fee, buyer->CharacterID());
break;
}
case BazaarPurchaseSuccess: {
@ -3933,20 +3956,21 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
//Send the item via parcel
CharacterParcelsRepository::CharacterParcels parcel_out{};
parcel_out.from_name = in->trader_buy_struct.seller_name;
parcel_out.note = "Delivered from a Bazaar Purchase";
parcel_out.sent_date = time(nullptr);
parcel_out.quantity = quantity;
parcel_out.item_id = in->trader_buy_struct.item_id;
parcel_out.aug_slot_1 = in->item_aug_1;
parcel_out.aug_slot_2 = in->item_aug_2;
parcel_out.aug_slot_3 = in->item_aug_3;
parcel_out.aug_slot_4 = in->item_aug_4;
parcel_out.aug_slot_5 = in->item_aug_5;
parcel_out.aug_slot_6 = in->item_aug_6;
parcel_out.char_id = buyer->CharacterID();
parcel_out.slot_id = buyer->FindNextFreeParcelSlot(buyer->CharacterID());
parcel_out.id = 0;
parcel_out.from_name = in->trader_buy_struct.seller_name;
parcel_out.note = "Delivered from a Bazaar Purchase";
parcel_out.sent_date = time(nullptr);
parcel_out.quantity = quantity;
parcel_out.item_id = in->trader_buy_struct.item_id;
parcel_out.item_unique_id = in->trader_buy_struct.item_unique_id;
parcel_out.aug_slot_1 = in->item_aug_1;
parcel_out.aug_slot_2 = in->item_aug_2;
parcel_out.aug_slot_3 = in->item_aug_3;
parcel_out.aug_slot_4 = in->item_aug_4;
parcel_out.aug_slot_5 = in->item_aug_5;
parcel_out.aug_slot_6 = in->item_aug_6;
parcel_out.char_id = buyer->CharacterID();
parcel_out.slot_id = buyer->FindNextFreeParcelSlot(buyer->CharacterID());
parcel_out.id = 0;
CharacterParcelsRepository::InsertOne(database, parcel_out);
@ -3973,12 +3997,11 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
strn0cpy(ps.send_to, buyer->GetCleanName(), sizeof(ps.send_to));
buyer->SendParcelDeliveryToWorld(ps);
LogTradingDetail(
"Step 3:Bazaar Purchase. Sent parcel to Buyer [{}] Item ID [{}] Quantity [{}] Charges [{}]",
LogTradingDetail("Step 7:Bazaar Purchase. Sent parcel to Buyer [{}] for purchase of [{}] {}{}",
buyer->CharacterID(),
in->trader_buy_struct.item_id,
in->item_quantity,
in->item_charges
quantity,
quantity > 1 ? fmt::format("{}s", in->trader_buy_struct.item_name) : in->trader_buy_struct.item_name,
item->MaxCharges > 0 ? fmt::format(" with charges of [{}]", in->item_charges) : std::string("")
);
//Update the buyer to indicate the sale has completed
@ -3987,6 +4010,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
memcpy(data, &in->trader_buy_struct, sizeof(TraderBuy_Struct));
buyer->ReturnTraderReq(&outapp, in->item_quantity, in->trader_buy_struct.item_id);
LogTradingDetail("Step 8:Bazaar Purchase. Purchase complete. Sending update packet to buyer.");
break;
}