veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-06-20 15:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Loot): Loot wild quest game objects

Browse Source
This commit is contained in:
bash 2026-05-01 14:49:03 +02:00
parent d8910b0ed0
commit d9bfea502d
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ai/Base/Actions/LootAction.cpp
View File

@ -5,6 +5,7 @@
#include "LootAction.h"
#include "Bag.h"
#include "ChatHelper.h"
#include "Event.h"
#include "GuildMgr.h"
@ -139,8 +140,9 @@ bool OpenLootAction::DoLoot(LootObject& lootObject)
if (go && (go->GetGoState() != GO_STATE_READY))
return false;
// This prevents dungeon chests like Tribunal Chest (Halls of Stone) from being ninja'd by the bots
if (go && go->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND))
// Block event-gated chests (Tribunal Chest, Gunship Armory) but allow
// wild quest GOs (Moonpetal Lily etc.) when the bot is on the quest.
if (go && go->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND) && !lootObject.isNeededQuestItem)
return false;
// This prevents raid chests like Gunship Armory (ICC) from being ninja'd by the bots

38
src/Mgr/Item/LootObjectStack.cpp
View File

@ -45,7 +45,8 @@ void LootTargetList::shrink(time_t fromTime)
}
}
LootObject::LootObject(Player* bot, ObjectGuid guid) : guid(), skillId(SKILL_NONE), reqSkillValue(0), reqItem(0)
LootObject::LootObject(Player* bot, ObjectGuid guid)
: guid(), skillId(SKILL_NONE), reqSkillValue(0), reqItem(0), isNeededQuestItem(false)
{
Refresh(bot, guid);
}
@ -55,6 +56,7 @@ void LootObject::Refresh(Player* bot, ObjectGuid lootGUID)
skillId = SKILL_NONE;
reqSkillValue = 0;
reqItem = 0;
isNeededQuestItem = false;
guid.Clear();
PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
@ -101,6 +103,7 @@ void LootObject::Refresh(Player* bot, ObjectGuid lootGUID)
if (IsNeededForQuest(bot, itemId))
{
this->guid = lootGUID;
this->isNeededQuestItem = true;
return;
}
@ -135,10 +138,21 @@ void LootObject::Refresh(Player* bot, ObjectGuid lootGUID)
if (!proto)
continue;
// Moonpetal Lily, Hyacinth Mushroom etc. expose quest
// drops here (not in gameobject_questitem). Flag it so
// the INTERACT_COND gate lets the bot through.
if (IsNeededForQuest(bot, itemId))
{
this->guid = lootGUID;
this->isNeededQuestItem = true;
return;
}
if (proto->Class != ITEM_CLASS_QUEST)
{
onlyHasQuestItems = false;
break;
// keep scanning — a later item may be needed
continue;
}
// If this item references another loot table, process it
@ -157,11 +171,15 @@ void LootObject::Refresh(Player* bot, ObjectGuid lootGUID)
if (!refProto)
continue;
if (refProto->Class != ITEM_CLASS_QUEST)
if (IsNeededForQuest(bot, refItemId))
{
onlyHasQuestItems = false;
break;
this->guid = lootGUID;
this->isNeededQuestItem = true;
return;
}
if (refProto->Class != ITEM_CLASS_QUEST)
onlyHasQuestItems = false;
}
}
}
@ -270,6 +288,7 @@ LootObject::LootObject(LootObject const& other)
skillId = other.skillId;
reqSkillValue = other.reqSkillValue;
reqItem = other.reqItem;
isNeededQuestItem = other.isNeededQuestItem;
}
bool LootObject::IsLootPossible(Player* bot)
@ -299,10 +318,13 @@ bool LootObject::IsLootPossible(Player* bot)
return false;
}
// Prevent bot from running to chests that are unlootable (e.g. Gunship Armory before completing the event) or on
// respawn time
// Block event-gated chests (Gunship Armory pre-event) and unspawned
// GOs. INTERACT_COND alone is allowed when the GO holds a quest
// item we need — ConditionMgr already gates on quest state.
GameObject* go = botAI->GetGameObject(guid);
if (go && (go->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND | GO_FLAG_NOT_SELECTABLE) || !go->isSpawned()))
if (go && (go->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE) || !go->isSpawned()))
return false;
if (go && go->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND) && !isNeededQuestItem)
return false;
if (skillId == SKILL_NONE)

5
src/Mgr/Item/LootObjectStack.h
View File

@ -26,7 +26,7 @@ public:
class LootObject
{
public:
LootObject() : skillId(0), reqSkillValue(0), reqItem(0) {}
LootObject() : skillId(0), reqSkillValue(0), reqItem(0), isNeededQuestItem(false) {}
LootObject(Player* bot, ObjectGuid guid);
LootObject(LootObject const& other);
LootObject& operator=(LootObject const& other) = default;
@ -40,6 +40,9 @@ public:
uint32 skillId;
uint32 reqSkillValue;
uint32 reqItem;
// GO holds a quest item we still need; lets us bypass the
// INTERACT_COND blanket reject in the loot path
bool isNeededQuestItem;
private:
static bool IsNeededForQuest(Player* bot, uint32 itemId);