pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bot] Add EVENT_TRADE Support to Bots. (#2560)

Browse Source 
* [Bot] Add EVENT_TRADE Support to Bots.

* Fixed issue with duplicate items after Event Trade

* Update logic

* Add CalcBotStats call after Bot Trade Event

* Fix Lua EVENT_TRADE.

* Formatting.

* More formatting.

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Aeadoin
2022-11-25 15:09:08 -05:00
committed by GitHub
parent 45c4fe55f0
commit 99052aec8b
6 changed files with 242 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+91 -32
View File
@@ -4571,11 +4571,11 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
using namespace EQ;
struct ClientTrade {
const ItemInstance* trade_item_instance;
ItemInstance* trade_item_instance;
int16 from_client_slot;
int16 to_bot_slot;
ClientTrade(const ItemInstance* item, int16 from) : trade_item_instance(item), from_client_slot(from), to_bot_slot(invslot::SLOT_INVALID) { }
ClientTrade(ItemInstance* item, int16 from) : trade_item_instance(item), from_client_slot(from), to_bot_slot(invslot::SLOT_INVALID) { }
};
struct ClientReturn {
@@ -4639,11 +4639,19 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
}
std::list<ClientTrade> client_trade;
std::list<ClientTrade> event_trade;
std::list<ClientReturn> client_return;
bool trade_event_exists = false;
if (parse->BotHasQuestSub(EVENT_TRADE)) {
// There is a EVENT_TRADE, we will let the Event handle returning of items.
trade_event_exists = true;
}
// pre-checks for incoming illegal transfers
EQ::InventoryProfile& user_inv = client->GetInv();
for (int16 trade_index = begin_slot_id; trade_index <= end_slot_id; ++trade_index) {
auto trade_instance = client->GetInv()[trade_index];
auto trade_instance = user_inv.GetItem(trade_index);
if (!trade_instance) {
continue;
}
@@ -4675,37 +4683,61 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
}
if (trade_instance->IsStackable() && trade_instance->GetCharges() < trade_instance->GetItem()->StackSize) { // temp until partial stacks are implemented
client->Message(
Chat::Yellow,
fmt::format(
"{} is only a partially stacked item, the trade has been cancelled!",
item_link
).c_str()
);
client->ResetTrade();
return;
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_instance, trade_index));
continue;
}
else {
client->Message(
Chat::Yellow,
fmt::format(
"{} is only a partially stacked item, the trade has been cancelled!",
item_link
).c_str()
);
client->ResetTrade();
return;
}
}
if (CheckLoreConflict(trade_instance->GetItem())) {
client->Message(
Chat::Yellow,
fmt::format(
"This bot already has {}, the trade has been cancelled!",
item_link
).c_str()
);
client->ResetTrade();
return;
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_instance, trade_index));
continue;
}
else {
client->Message(
Chat::Yellow,
fmt::format(
"This bot already has {}, the trade has been cancelled!",
item_link
).c_str()
);
client->ResetTrade();
return;
}
}
if (!trade_instance->IsType(item::ItemClassCommon)) {
client_return.push_back(ClientReturn(trade_instance, trade_index));
continue;
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_instance, trade_index));
continue;
}
else {
client->ResetTrade();
return;
}
}
if (!trade_instance->IsEquipable(GetBaseRace(), GetClass()) || (GetLevel() < trade_instance->GetItem()->ReqLevel)) { // deity checks will be handled within IsEquipable()
client_return.push_back(ClientReturn(trade_instance, trade_index));
continue;
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_instance, trade_index));
continue;
}
else {
client->ResetTrade();
return;
}
}
client_trade.push_back(ClientTrade(trade_instance, trade_index));
@@ -4713,7 +4745,9 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
// check for incoming lore hacks
for (auto& trade_iterator : client_trade) {
if (!trade_iterator.trade_item_instance->GetItem()->LoreFlag) {
auto trade_instance = trade_iterator.trade_item_instance;
auto trade_index = trade_iterator.from_client_slot;
if (!trade_instance->GetItem()->LoreFlag) {
continue;
}
@@ -4726,14 +4760,14 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
continue;
}
if (trade_iterator.trade_item_instance->GetItem()->LoreGroup == -1 && check_iterator.trade_item_instance->GetItem()->ID == trade_iterator.trade_item_instance->GetItem()->ID) {
if (trade_instance->GetItem()->LoreGroup == -1 && check_iterator.trade_item_instance->GetItem()->ID == trade_instance->GetItem()->ID) {
LogError("Bot::PerformTradeWithClient trade hack detected by {} with {}.", client->GetCleanName(), GetCleanName());
client->Message(Chat::White, "Trade hack detected, the trade has been cancelled.");
client->ResetTrade();
return;
}
if ((trade_iterator.trade_item_instance->GetItem()->LoreGroup > 0) && (check_iterator.trade_item_instance->GetItem()->LoreGroup == trade_iterator.trade_item_instance->GetItem()->LoreGroup)) {
if ((trade_instance->GetItem()->LoreGroup > 0) && (check_iterator.trade_item_instance->GetItem()->LoreGroup == trade_instance->GetItem()->LoreGroup)) {
LogError("Bot::PerformTradeWithClient trade hack detected by {} with {}.", client->GetCleanName(), GetCleanName());
client->Message(Chat::White, "Trade hack detected, the trade has been cancelled.");
client->ResetTrade();
@@ -4833,12 +4867,19 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
}
}
// move unassignable items from trade list to return list
// move unassignable items from trade list to event list
for (std::list<ClientTrade>::iterator trade_iterator = client_trade.begin(); trade_iterator != client_trade.end();) {
if (trade_iterator->to_bot_slot == invslot::SLOT_INVALID) {
client_return.push_back(ClientReturn(trade_iterator->trade_item_instance, trade_iterator->from_client_slot));
trade_iterator = client_trade.erase(trade_iterator);
continue;
if (trade_event_exists) {
event_trade.push_back(ClientTrade(trade_iterator->trade_item_instance, trade_iterator->from_client_slot));
trade_iterator = client_trade.erase(trade_iterator);
continue;
}
else {
client_return.push_back(ClientReturn(trade_iterator->trade_item_instance, trade_iterator->from_client_slot));
trade_iterator = client_trade.erase(trade_iterator);
continue;
}
}
++trade_iterator;
}
@@ -5035,6 +5076,24 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
if (accepted_count) {
CalcBotStats(client->GetBotOption(Client::booStatsUpdate));
}
if (event_trade.size()) {
// Get Traded Items
EQ::ItemInstance* insts[8] = { 0 };
EQ::InventoryProfile& user_inv = client->GetInv();
for (int i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_END; ++i) {
insts[i - EQ::invslot::TRADE_BEGIN] = user_inv.GetItem(i);
client->DeleteItemInInventory(i);
}
// copy to be filtered by task updates, null trade slots preserved for quest event arg
std::vector<EQ::ItemInstance*> items(insts, insts + std::size(insts));
// Check if EVENT_TRADE accepts any items
std::vector<std::any> item_list(items.begin(), items.end());
parse->EventBot(EVENT_TRADE, this, client, "", 0, &item_list);
CalcBotStats(false);
}
}
bool Bot::Death(Mob *killerMob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) {