mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-02-07 20:51:09 +00:00
b31bda85ee
# Pull Request The purposes of this PR are to (1) establish a general raid helper framework for the benefit of future raid strategies and (2) make some improvements to problematic areas of the raid strategy code. List of changes: 1. Added new RaidBossHelpers.cpp and RaidBossHelpers.h files in the Raid folder. 3. Moved reused helpers from Karazhan, Gruul, and Magtheridon strategies to the new helper files. 4. Modified the prior function that assigned a DPS bot to store and erase timers and trackers in associative containers--the function now includes parameters for mapId (so a bot that is not in the instance will not be assigned) and for the ability to exclude a bot (useful for excluding particular important roles, such as a Warlock tank, so they are not bogged down by these extra tasks at critical moments). I also renamed it from IsInstanceTimerManager to IsMechanicTrackerBot. 5. Moved all helper files in raid strategies to Util folders (was needed for ICC, MC, and Ulduar). 6. Renamed and reordered includes of Ulduar files in AiObjectContext.cpp to match other raid strategies. a. This initially caused compile errors which made me realize that the existing code had several problems with missing includes and was compiling only due to the prior ordering in AiObjectContext.cpp. Therefore, I added the missing includes to Molten Core, Ulduar, and Vault of Archavon strategies. b. Ulduar and Old Kingdom were also using the same constant name for a spell--the reordering caused a compile error here as well, which just highlighted an existing problem that was being hidden. I renamed the constant for Ulduar to fix this, but I think the better approach going forward would be to use a namespace or enum class. But that is for another time and probably another person. 7. Several changes with respect to Ulduar files: a. The position constants and enums for spells and NPCs and such were in the trigger header file. I did not think that made sense so moved them to existing helper files. b. Since the strategy does not use multipliers, I removed all files and references to multipliers in it. c. I removed some unneeded includes. I did not do a detailed review to determine what else could be removed--I just took some out that I could tell right away were not needed. d. I renamed the ingame strategy name from "uld" to "ulduar," which I think is clearer and is still plenty short. 8. Partial refactor of Gruul and Magtheridon strategies: a. I did not due a full refactoring but made some quick changes to things I did previously that were rather stupid like repeating calculations, having useless logic like pointless IsAlive() checks for creatures already on the hostile references list, and not using the existing Position class for coordinates. b. There were a few substantive changes, such as allowing players to pick Maulgar mage and moonkin tanks with the assistant flag, but a greater refactoring of the strategies themselves is beyond this PR. c. I was clearing some containers used for Gruul and Magtheridon strategies; the methods are now fixed to erase only the applicable keys so that in the unlikely event that one server has multiple groups running Gruul or Magtheridon at the same time, there won't be timer or position tracker conflicts. ## How to Test the Changes 1. Enter any raid instance that has any code impacted by this PR 2. Engage bosses and observe if any strategies are now broken I personally tested Maulgar, Gruul, and Magtheridon and confirmed that they still work as intended. ## Complexity & Impact I do not expect this PR to have any relevant changes to in-game performance, but I will defer to those more knowledgeable than I if there are concerns in this area. As I've mentioned before, you can consider me to be like a person who has taken half an intro C++ course at best. ## AI Assistance None beyond autocomplete of repetitive changes. --------- Co-authored-by: bashermens <31279994+hermensbas@users.noreply.github.com>
270 lines
11 KiB
C++
270 lines
11 KiB
C++
/*
|
|
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
|
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
|
*/
|
|
|
|
#include "AiObjectContext.h"
|
|
|
|
#include "ActionContext.h"
|
|
#include "ChatActionContext.h"
|
|
#include "ChatTriggerContext.h"
|
|
#include "DKAiObjectContext.h"
|
|
#include "DruidAiObjectContext.h"
|
|
#include "HunterAiObjectContext.h"
|
|
#include "MageAiObjectContext.h"
|
|
#include "PaladinAiObjectContext.h"
|
|
#include "Playerbots.h"
|
|
#include "PriestAiObjectContext.h"
|
|
#include "RogueAiObjectContext.h"
|
|
#include "ShamanAiObjectContext.h"
|
|
#include "SharedValueContext.h"
|
|
#include "StrategyContext.h"
|
|
#include "TriggerContext.h"
|
|
#include "ValueContext.h"
|
|
#include "WarlockAiObjectContext.h"
|
|
#include "WarriorAiObjectContext.h"
|
|
#include "WorldPacketActionContext.h"
|
|
#include "WorldPacketTriggerContext.h"
|
|
#include "Ai/Dungeon/DungeonStrategyContext.h"
|
|
#include "Ai/Dungeon/WotlkDungeonActionContext.h"
|
|
#include "Ai/Dungeon/WotlkDungeonTriggerContext.h"
|
|
#include "Ai/Raid/RaidStrategyContext.h"
|
|
#include "Ai/Raid/Aq20/RaidAq20ActionContext.h"
|
|
#include "Ai/Raid/Aq20/RaidAq20TriggerContext.h"
|
|
#include "Ai/Raid/MoltenCore/RaidMcActionContext.h"
|
|
#include "Ai/Raid/MoltenCore/RaidMcTriggerContext.h"
|
|
#include "Ai/Raid/BlackwingLair/RaidBwlActionContext.h"
|
|
#include "Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h"
|
|
#include "Ai/Raid/Karazhan/RaidKarazhanActionContext.h"
|
|
#include "Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h"
|
|
#include "Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h"
|
|
#include "Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h"
|
|
#include "Ai/Raid/GruulsLair/RaidGruulsLairActionContext.h"
|
|
#include "Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h"
|
|
#include "Ai/Raid/EyeOfEternity/RaidEoEActionContext.h"
|
|
#include "Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h"
|
|
#include "Ai/Raid/VaultOfArchavon/RaidVoAActionContext.h"
|
|
#include "Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h"
|
|
#include "Ai/Raid/ObsidianSanctum/RaidOsActionContext.h"
|
|
#include "Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h"
|
|
#include "Ai/Raid/Ulduar/RaidUlduarActionContext.h"
|
|
#include "Ai/Raid/Ulduar/RaidUlduarTriggerContext.h"
|
|
#include "Ai/Raid/Onyxia/RaidOnyxiaActionContext.h"
|
|
#include "Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h"
|
|
#include "Ai/Raid/Icecrown/RaidIccActionContext.h"
|
|
#include "Ai/Raid/Icecrown/RaidIccTriggerContext.h"
|
|
|
|
SharedNamedObjectContextList<Strategy> AiObjectContext::sharedStrategyContexts;
|
|
SharedNamedObjectContextList<Action> AiObjectContext::sharedActionContexts;
|
|
SharedNamedObjectContextList<Trigger> AiObjectContext::sharedTriggerContexts;
|
|
SharedNamedObjectContextList<UntypedValue> AiObjectContext::sharedValueContexts;
|
|
|
|
AiObjectContext::AiObjectContext(PlayerbotAI* botAI, SharedNamedObjectContextList<Strategy>& sharedStrategyContext,
|
|
SharedNamedObjectContextList<Action>& sharedActionContext,
|
|
SharedNamedObjectContextList<Trigger>& sharedTriggerContext,
|
|
SharedNamedObjectContextList<UntypedValue>& sharedValueContext)
|
|
: PlayerbotAIAware(botAI),
|
|
strategyContexts(sharedStrategyContext),
|
|
actionContexts(sharedActionContext),
|
|
triggerContexts(sharedTriggerContext),
|
|
valueContexts(sharedValueContext)
|
|
{
|
|
}
|
|
|
|
void AiObjectContext::BuildAllSharedContexts()
|
|
{
|
|
AiObjectContext::BuildSharedContexts();
|
|
PriestAiObjectContext::BuildSharedContexts();
|
|
MageAiObjectContext::BuildSharedContexts();
|
|
WarlockAiObjectContext::BuildSharedContexts();
|
|
WarriorAiObjectContext::BuildSharedContexts();
|
|
ShamanAiObjectContext::BuildSharedContexts();
|
|
PaladinAiObjectContext::BuildSharedContexts();
|
|
DruidAiObjectContext::BuildSharedContexts();
|
|
HunterAiObjectContext::BuildSharedContexts();
|
|
RogueAiObjectContext::BuildSharedContexts();
|
|
DKAiObjectContext::BuildSharedContexts();
|
|
}
|
|
|
|
void AiObjectContext::BuildSharedContexts()
|
|
{
|
|
BuildSharedStrategyContexts(sharedStrategyContexts);
|
|
BuildSharedActionContexts(sharedActionContexts);
|
|
BuildSharedTriggerContexts(sharedTriggerContexts);
|
|
BuildSharedValueContexts(sharedValueContexts);
|
|
}
|
|
|
|
void AiObjectContext::BuildSharedStrategyContexts(SharedNamedObjectContextList<Strategy>& strategyContexts)
|
|
{
|
|
strategyContexts.Add(new StrategyContext());
|
|
strategyContexts.Add(new MovementStrategyContext());
|
|
strategyContexts.Add(new AssistStrategyContext());
|
|
strategyContexts.Add(new QuestStrategyContext());
|
|
strategyContexts.Add(new DungeonStrategyContext());
|
|
strategyContexts.Add(new RaidStrategyContext());
|
|
}
|
|
|
|
void AiObjectContext::BuildSharedActionContexts(SharedNamedObjectContextList<Action>& actionContexts)
|
|
{
|
|
actionContexts.Add(new ActionContext());
|
|
actionContexts.Add(new ChatActionContext());
|
|
actionContexts.Add(new WorldPacketActionContext());
|
|
actionContexts.Add(new RaidAq20ActionContext());
|
|
actionContexts.Add(new RaidMcActionContext());
|
|
actionContexts.Add(new RaidBwlActionContext());
|
|
actionContexts.Add(new RaidKarazhanActionContext());
|
|
actionContexts.Add(new RaidMagtheridonActionContext());
|
|
actionContexts.Add(new RaidGruulsLairActionContext());
|
|
actionContexts.Add(new RaidOsActionContext());
|
|
actionContexts.Add(new RaidEoEActionContext());
|
|
actionContexts.Add(new RaidVoAActionContext());
|
|
actionContexts.Add(new RaidUlduarActionContext());
|
|
actionContexts.Add(new RaidOnyxiaActionContext());
|
|
actionContexts.Add(new RaidIccActionContext());
|
|
actionContexts.Add(new WotlkDungeonUKActionContext());
|
|
actionContexts.Add(new WotlkDungeonNexActionContext());
|
|
actionContexts.Add(new WotlkDungeonANActionContext());
|
|
actionContexts.Add(new WotlkDungeonOKActionContext());
|
|
actionContexts.Add(new WotlkDungeonDTKActionContext());
|
|
actionContexts.Add(new WotlkDungeonVHActionContext());
|
|
actionContexts.Add(new WotlkDungeonGDActionContext());
|
|
actionContexts.Add(new WotlkDungeonHoSActionContext());
|
|
actionContexts.Add(new WotlkDungeonHoLActionContext());
|
|
actionContexts.Add(new WotlkDungeonOccActionContext());
|
|
actionContexts.Add(new WotlkDungeonUPActionContext());
|
|
actionContexts.Add(new WotlkDungeonCoSActionContext());
|
|
actionContexts.Add(new WotlkDungeonFoSActionContext());
|
|
actionContexts.Add(new WotlkDungeonPoSActionContext());
|
|
actionContexts.Add(new WotlkDungeonToCActionContext());
|
|
}
|
|
|
|
void AiObjectContext::BuildSharedTriggerContexts(SharedNamedObjectContextList<Trigger>& triggerContexts)
|
|
{
|
|
triggerContexts.Add(new TriggerContext());
|
|
triggerContexts.Add(new ChatTriggerContext());
|
|
triggerContexts.Add(new WorldPacketTriggerContext());
|
|
triggerContexts.Add(new RaidAq20TriggerContext());
|
|
triggerContexts.Add(new RaidMcTriggerContext());
|
|
triggerContexts.Add(new RaidBwlTriggerContext());
|
|
triggerContexts.Add(new RaidKarazhanTriggerContext());
|
|
triggerContexts.Add(new RaidMagtheridonTriggerContext());
|
|
triggerContexts.Add(new RaidGruulsLairTriggerContext());
|
|
triggerContexts.Add(new RaidOsTriggerContext());
|
|
triggerContexts.Add(new RaidEoETriggerContext());
|
|
triggerContexts.Add(new RaidVoATriggerContext());
|
|
triggerContexts.Add(new RaidUlduarTriggerContext());
|
|
triggerContexts.Add(new RaidOnyxiaTriggerContext());
|
|
triggerContexts.Add(new RaidIccTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonUKTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonNexTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonANTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonOKTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonDTKTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonVHTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonGDTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonHoSTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonHoLTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonOccTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonUPTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonCoSTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonFoSTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonPoSTriggerContext());
|
|
triggerContexts.Add(new WotlkDungeonToCTriggerContext());
|
|
}
|
|
|
|
void AiObjectContext::BuildSharedValueContexts(SharedNamedObjectContextList<UntypedValue>& valueContexts)
|
|
{
|
|
valueContexts.Add(new ValueContext());
|
|
}
|
|
|
|
std::vector<std::string> AiObjectContext::Save()
|
|
{
|
|
std::vector<std::string> result;
|
|
|
|
std::set<std::string> names = valueContexts.GetCreated();
|
|
for (std::set<std::string>::iterator i = names.begin(); i != names.end(); ++i)
|
|
{
|
|
UntypedValue* value = GetUntypedValue(*i);
|
|
if (!value)
|
|
continue;
|
|
|
|
std::string const data = value->Save();
|
|
if (data == "?")
|
|
continue;
|
|
|
|
std::string const name = *i;
|
|
std::ostringstream out;
|
|
out << name;
|
|
|
|
out << ">" << data;
|
|
result.push_back(out.str());
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void AiObjectContext::Load(std::vector<std::string> data)
|
|
{
|
|
for (std::vector<std::string>::iterator i = data.begin(); i != data.end(); ++i)
|
|
{
|
|
std::string const row = *i;
|
|
std::vector<std::string> parts = split(row, '>');
|
|
if (parts.size() != 2)
|
|
continue;
|
|
|
|
std::string const name = parts[0];
|
|
std::string const text = parts[1];
|
|
|
|
UntypedValue* value = GetUntypedValue(name);
|
|
if (!value)
|
|
continue;
|
|
|
|
value->Load(text);
|
|
}
|
|
}
|
|
|
|
Strategy* AiObjectContext::GetStrategy(std::string const name)
|
|
{
|
|
return strategyContexts.GetContextObject(name, botAI);
|
|
}
|
|
|
|
std::set<std::string> AiObjectContext::GetSiblingStrategy(std::string const name)
|
|
{
|
|
return strategyContexts.GetSiblings(name);
|
|
}
|
|
|
|
Trigger* AiObjectContext::GetTrigger(std::string const name) { return triggerContexts.GetContextObject(name, botAI); }
|
|
|
|
Action* AiObjectContext::GetAction(std::string const name) { return actionContexts.GetContextObject(name, botAI); }
|
|
|
|
UntypedValue* AiObjectContext::GetUntypedValue(std::string const name)
|
|
{
|
|
return valueContexts.GetContextObject(name, botAI);
|
|
}
|
|
|
|
std::set<std::string> AiObjectContext::GetValues() { return valueContexts.GetCreated(); }
|
|
|
|
std::set<std::string> AiObjectContext::GetSupportedStrategies() { return strategyContexts.supports(); }
|
|
|
|
std::set<std::string> AiObjectContext::GetSupportedActions() { return actionContexts.supports(); }
|
|
|
|
std::string const AiObjectContext::FormatValues()
|
|
{
|
|
std::ostringstream out;
|
|
std::set<std::string> names = valueContexts.GetCreated();
|
|
for (std::set<std::string>::iterator i = names.begin(); i != names.end(); ++i, out << "|")
|
|
{
|
|
UntypedValue* value = GetUntypedValue(*i);
|
|
if (!value)
|
|
continue;
|
|
|
|
std::string const text = value->Format();
|
|
if (text == "?")
|
|
continue;
|
|
|
|
out << "{" << *i << "=" << text << "}";
|
|
}
|
|
|
|
return out.str();
|
|
}
|