pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bots] Optimize inventory loading. (#2588)

Browse Source 
* [Bots] Optimize inventory loading.

# Notes
- Bots previously were running 23 individual queries to load their inventory versus grabbing their inventory all at once and referencing it in memory.

* Typo.

* Update bot_database.cpp

* Update bot_database.cpp

* Update bot.cpp
This commit is contained in:
Alex King
2022-11-27 19:07:24 -05:00
committed by GitHub
parent d6db35b84e
commit 200c6cccaf
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+27 -7
View File
@@ -4016,11 +4016,10 @@ bool Bot::Spawn(Client* botCharacterOwner) {
ping_timer.Start(8000);
// there is something askew with spawn struct appearance fields...
// I re-enabled this until I can sort it out
uint32 item_id = 0;
const auto& m = GetBotItemSlots();
uint8 material_from_slot = 0xFF;
for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
item_id = GetBotItemBySlot(slot_id);
if (item_id != 0) {
if (m.find(slot_id) != m.end()) {
material_from_slot = EQ::InventoryProfile::CalcMaterialFromSlot(slot_id);
if (material_from_slot != 0xFF) {
SendWearChange(material_from_slot);
@@ -4064,6 +4063,26 @@ void Bot::GetBotItems(EQ::InventoryProfile &inv, std::string* error_message)
UpdateEquipmentLight();
}
std::map<uint16, uint32> Bot::GetBotItemSlots()
{
std::map<uint16, uint32> m;
if (!GetBotID()) {
return m;
}
if (!database.botdb.LoadItemSlots(GetBotID(), m)) {
GetBotOwner()->CastToClient()->Message(
Chat::White,
fmt::format(
"Failed to load inventory slots for {}.",
GetCleanName()
).c_str()
);
}
return m;
}
// Returns the inventory record for this bot from the database for the specified equipment slot.
uint32 Bot::GetBotItemBySlot(uint16 slot_id)
{
@@ -4077,8 +4096,9 @@ uint32 Bot::GetBotItemBySlot(uint16 slot_id)
GetBotOwner()->CastToClient()->Message(
Chat::White,
fmt::format(
"{}",
BotDatabase::fail::LoadItemBySlot()
"Failed to load slot ID {} for {}.",
slot_id,
GetCleanName()
).c_str()
);
}
@@ -4734,11 +4754,11 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
return;
}
}
if (
!trade_instance->IsClassEquipable(GetClass()) ||
GetLevel() < trade_instance->GetItem()->ReqLevel ||
(!trade_instance->IsRaceEquipable(GetRace()) && !RuleB(Bot, AllowBotEquipAnyRaceGear))
(!trade_instance->IsRaceEquipable(GetRace()) && !RuleB(Bots, AllowBotEquipAnyRaceGear))
) {
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_instance, trade_index));