pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-15 20:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Couple of critical fixes for bot trade code

Browse Source
This commit is contained in:
Uleat 2017-03-10 18:41:04 -05:00
parent 37d22e17a3
commit bf3d9b2d02
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/item_data.cpp
View File

@ -195,7 +195,7 @@ bool EQEmu::ItemData::IsClassBook() const
bool EQEmu::ItemData::IsType1HWeapon() const bool EQEmu::ItemData::IsType1HWeapon() const
{ {
return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing)); return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing) || (ItemType == item::ItemTypeMartial));
} }
bool EQEmu::ItemData::IsType2HWeapon() const bool EQEmu::ItemData::IsType2HWeapon() const

26
zone/bot.cpp
View File

@ -3494,7 +3494,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
} }
// find equipment slots // find equipment slots
const bool can_dual_wield = CanThisClassDualWield(); const bool can_dual_wield = (GetSkill(EQEmu::skills::SkillDualWield) > 0);
bool melee_2h_weapon = false; bool melee_2h_weapon = false;
bool melee_secondary = false; bool melee_secondary = false;
@ -3542,8 +3542,9 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
if (!melee_secondary) { if (!melee_secondary) {
melee_2h_weapon = true; melee_2h_weapon = true;
if (m_inv[inventory::slotSecondary]) auto equipped_secondary_weapon = m_inv[inventory::slotSecondary];
client_return.push_back(ClientReturn(m_inv[inventory::slotSecondary], inventory::slotSecondary)); if (equipped_secondary_weapon)
client_return.push_back(ClientReturn(equipped_secondary_weapon, inventory::slotSecondary));
} }
else { else {
continue; continue;
@ -3552,10 +3553,16 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
} }
if (index == inventory::slotSecondary) { if (index == inventory::slotSecondary) {
if (!melee_2h_weapon) { if (!melee_2h_weapon) {
if ((can_dual_wield && trade_instance->GetItem()->IsType1HWeapon()) || trade_instance->GetItem()->IsTypeShield() || !trade_instance->IsWeapon()) if ((can_dual_wield && trade_instance->GetItem()->IsType1HWeapon()) || trade_instance->GetItem()->IsTypeShield() || !trade_instance->IsWeapon()) {
melee_secondary = true; melee_secondary = true;
else
auto equipped_primary_weapon = m_inv[inventory::slotPrimary];
if (equipped_primary_weapon && equipped_primary_weapon->GetItem()->IsType2HWeapon())
client_return.push_back(ClientReturn(equipped_primary_weapon, inventory::slotPrimary));
}
else {
continue; continue;
}
} }
else { else {
continue; continue;
@ -3681,15 +3688,16 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
} }
else { // successful trade returns else { // successful trade returns
auto return_instance = m_inv.PopItem(return_iterator.fromBotSlot); auto return_instance = m_inv.PopItem(return_iterator.fromBotSlot);
if (*return_instance != *return_iterator.returnItemInstance) { //if (*return_instance != *return_iterator.returnItemInstance) {
// TODO: add logging // // TODO: add logging
} //}
if (!botdb.DeleteItemBySlot(GetBotID(), return_iterator.fromBotSlot)) if (!botdb.DeleteItemBySlot(GetBotID(), return_iterator.fromBotSlot))
client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr")); client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr"));
BotRemoveEquipItem(return_iterator.fromBotSlot); BotRemoveEquipItem(return_iterator.fromBotSlot);
client->PutItemInInventory(return_iterator.toClientSlot, *return_instance, true); if (return_instance)
client->PutItemInInventory(return_iterator.toClientSlot, *return_instance, true);
InventoryProfile::MarkDirty(return_instance); InventoryProfile::MarkDirty(return_instance);
} }
return_iterator.returnItemInstance = nullptr; return_iterator.returnItemInstance = nullptr;