nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-07 20:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

inventory and use item

Browse Source
This commit is contained in:
Yunfan Li
2023-05-28 00:00:13 +08:00
parent 09463feb8f
commit 3432a9b37d
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/strategy/actions/InventoryAction.cpp
View File

@@ -282,10 +282,12 @@ std::vector<Item*> InventoryAction::parseItems(std::string const text, IterateIt
IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS); IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
found.insert(visitor.GetResult().begin(), visitor.GetResult().end()); found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
} }
if (text == "")
FindUsableNamedItemVisitor visitor(bot); {
IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS); FindUsableNamedItemVisitor visitor(bot);
found.insert(visitor.GetResult().begin(), visitor.GetResult().end()); IterateItems(&visitor, ITERATE_ITEMS_IN_BAGS);
found.insert(visitor.GetResult().begin(), visitor.GetResult().end());
}
uint32 quality = chat->parseItemQuality(text); uint32 quality = chat->parseItemQuality(text);
if (quality != MAX_ITEM_QUALITY) if (quality != MAX_ITEM_QUALITY)

14
src/strategy/actions/UseItemAction.cpp
View File

@@ -19,19 +19,7 @@ bool UseItemAction::Execute(Event event)
if (gos.empty()) if (gos.empty())
{ {
if (items.size() > 1) return UseItemAuto(*items.begin());
{
std::vector<Item*>::iterator i = items.begin();
Item* item = *i++;
Item* itemTarget = *i;
if (item->IsPotion() || item->GetTemplate()->Class == ITEM_CLASS_CONSUMABLE)
return UseItemAuto(item);
else
return UseItemOnItem(item, itemTarget);
}
else if (!items.empty())
return UseItemAuto(*items.begin());
} }
else else
{ {

2
src/strategy/actions/UseItemAction.h
View File

@@ -73,7 +73,7 @@ class UseRandomRecipe : public UseItemAction
bool isUseful() override; bool isUseful() override;
bool isPossible() override; bool isPossible() override;
bool Execute(Event event); bool Execute(Event event) override;
}; };
class UseRandomQuestItem : public UseItemAction class UseRandomQuestItem : public UseItemAction