yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tweak loot check for quest items

Browse Source
This commit is contained in:
郑佩茹
2023-03-23 09:18:49 -06:00
parent 29ecbcddb2
commit 352969a0c8
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/strategy/actions/LootAction.cpp
View File

@@ -403,7 +403,7 @@ bool StoreLootAction::Execute(Event event)
if (proto->Quality > ITEM_QUALITY_NORMAL && !urand(0, 50) && botAI->HasStrategy("emote", BOT_STATE_NON_COMBAT)) if (proto->Quality > ITEM_QUALITY_NORMAL && !urand(0, 50) && botAI->HasStrategy("emote", BOT_STATE_NON_COMBAT))
botAI->PlayEmote(TEXT_EMOTE_CHEER); botAI->PlayEmote(TEXT_EMOTE_CHEER);
if (proto->Quality >= ITEM_QUALITY_RARE && botAI->HasStrategy("emote", BOT_STATE_NON_COMBAT)) if (proto->Quality >= ITEM_QUALITY_RARE && !urand(0, 1) && botAI->HasStrategy("emote", BOT_STATE_NON_COMBAT))
botAI->PlayEmote(TEXT_EMOTE_CHEER); botAI->PlayEmote(TEXT_EMOTE_CHEER);
std::ostringstream out; std::ostringstream out;
@@ -428,14 +428,14 @@ bool StoreLootAction::IsLootAllowed(uint32 itemid, PlayerbotAI* botAI)
AiObjectContext* context = botAI->GetAiObjectContext(); AiObjectContext* context = botAI->GetAiObjectContext();
LootStrategy* lootStrategy = AI_VALUE(LootStrategy*, "loot strategy"); LootStrategy* lootStrategy = AI_VALUE(LootStrategy*, "loot strategy");
std::set<uint32>& lootItems = AI_VALUE(std::set<uint32>&, "always loot list");
if (lootItems.find(itemid) != lootItems.end())
return true;
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemid); ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemid);
if (!proto) if (!proto)
return false; return false;
std::set<uint32>& lootItems = AI_VALUE(std::set<uint32>&, "always loot list");
if (lootItems.find(itemid) != lootItems.end())
return true;
uint32 max = proto->MaxCount; uint32 max = proto->MaxCount;
if (max > 0 && botAI->GetBot()->HasItemCount(itemid, max, true)) if (max > 0 && botAI->GetBot()->HasItemCount(itemid, max, true))
return false; return false;
@@ -448,10 +448,6 @@ bool StoreLootAction::IsLootAllowed(uint32 itemid, PlayerbotAI* botAI)
return true; return true;
} }
//if (proto->Bonding == BIND_QUEST_ITEM || //Still testing if it works ok without these lines.
// proto->Bonding == BIND_QUEST_ITEM1 || //Eventually this has to be removed.
// proto->Class == ITEM_CLASS_QUEST)
//{
for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot) for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
{ {
uint32 entry = botAI->GetBot()->GetQuestSlotQuestId(slot); uint32 entry = botAI->GetBot()->GetQuestSlotQuestId(slot);
@@ -470,11 +466,16 @@ bool StoreLootAction::IsLootAllowed(uint32 itemid, PlayerbotAI* botAI)
} }
if (AI_VALUE2(uint32, "item count", proto->Name1) < quest->RequiredItemCount[i]) if (AI_VALUE2(uint32, "item count", proto->Name1) < quest->RequiredItemCount[i])
return true; return false;
} }
} }
} }
//if (proto->Bonding == BIND_QUEST_ITEM || //Still testing if it works ok without these lines.
// proto->Bonding == BIND_QUEST_ITEM1 || //Eventually this has to be removed.
// proto->Class == ITEM_CLASS_QUEST)
//{
bool canLoot = lootStrategy->CanLoot(proto, context); bool canLoot = lootStrategy->CanLoot(proto, context);
//if (canLoot && proto->Bonding == BIND_WHEN_PICKED_UP && botAI->HasActivePlayerMaster()) //if (canLoot && proto->Bonding == BIND_WHEN_PICKED_UP && botAI->HasActivePlayerMaster())
//canLoot = sPlayerbotAIConfig->IsInRandomAccountList(botAI->GetBot()->GetSession()->GetAccountId()); //canLoot = sPlayerbotAIConfig->IsInRandomAccountList(botAI->GetBot()->GetSession()->GetAccountId());