nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-05 11:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'liyunfan1223:master' into master

Browse Source
This commit is contained in:
avirar
2024-10-03 12:44:24 +10:00
committed by GitHub
parent 055f549dbd d81da0c916
commit e7e42a0845
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/strategy/actions/QueryQuestAction.cpp
View File

@@ -113,21 +113,33 @@ bool QueryQuestAction::Execute(Event event)
void QueryQuestAction::TellObjectives(uint32 questId) void QueryQuestAction::TellObjectives(uint32 questId)
{ {
Quest const* questTemplate = sObjectMgr->GetQuestTemplate(questId); Quest const* questTemplate = sObjectMgr->GetQuestTemplate(questId);
// Checks if the questTemplate is valid
if (!questTemplate)
{
botAI->TellMaster("Quest template not found.");
return;
}
QuestStatusData questStatus = bot->getQuestStatusMap()[questId]; QuestStatusData questStatus = bot->getQuestStatusMap()[questId];
for (uint32 i = 0; i < QUEST_OBJECTIVES_COUNT; i++) for (uint32 i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
{ {
// Checks for objective text
if (!questTemplate->ObjectiveText[i].empty()) if (!questTemplate->ObjectiveText[i].empty())
botAI->TellMaster(questTemplate->ObjectiveText[i]); botAI->TellMaster(questTemplate->ObjectiveText[i]);
// Checks for required items
if (questTemplate->RequiredItemId[i]) if (questTemplate->RequiredItemId[i])
{ {
uint32 required = questTemplate->RequiredItemCount[i]; uint32 required = questTemplate->RequiredItemCount[i];
uint32 available = questStatus.ItemCount[i]; uint32 available = questStatus.ItemCount[i];
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(questTemplate->RequiredItemId[i]); ItemTemplate const* proto = sObjectMgr->GetItemTemplate(questTemplate->RequiredItemId[i]);
TellObjective(chat->FormatItem(proto), available, required); if (proto)
TellObjective(chat->FormatItem(proto), available, required);
} }
// Checks for required NPCs or GOs
if (questTemplate->RequiredNpcOrGo[i]) if (questTemplate->RequiredNpcOrGo[i])
{ {
uint32 required = questTemplate->RequiredNpcOrGoCount[i]; uint32 required = questTemplate->RequiredNpcOrGoCount[i];
@@ -135,8 +147,7 @@ void QueryQuestAction::TellObjectives(uint32 questId)
if (questTemplate->RequiredNpcOrGo[i] < 0) if (questTemplate->RequiredNpcOrGo[i] < 0)
{ {
if (GameObjectTemplate const* info = if (GameObjectTemplate const* info = sObjectMgr->GetGameObjectTemplate(-questTemplate->RequiredNpcOrGo[i]))
sObjectMgr->GetGameObjectTemplate(-questTemplate->RequiredNpcOrGo[i]))
TellObjective(info->name, available, required); TellObjective(info->name, available, required);
} }
else else

2
src/strategy/values/EstimatedLifetimeValue.cpp
View File

@@ -25,7 +25,7 @@ float EstimatedLifetimeValue::Calculate()
float EstimatedGroupDpsValue::Calculate() float EstimatedGroupDpsValue::Calculate()
{ {
float totalDps; float totalDps = 0;
std::vector<Player*> groupPlayer = {bot}; std::vector<Player*> groupPlayer = {bot};
if (Group* group = bot->GetGroup()) if (Group* group = bot->GetGroup())