mirror of
https://github.com/liyunfan1223/mod-playerbots.git
synced 2026-06-20 23:49:25 +02:00
18bd655869
### Summary This PR restores the Naxxramas raid strategies that were removed in commit 686fe513b25bbb20ccfcc89f08ee8c4b498a263e . The reintroduced logic is core‑friendly (no AzerothCore script headers or internal boss AI/EventMap dependencies), and the Naxxramas actions have been refactored into per‑boss files for better maintainability. ### Motivation The previous removal was meant to avoid core modifications and unblock upstreaming. This PR brings the strategies back while adhering to that requirement, using only observable state and mod‑playerbots helpers. ### What’s included - Re‑enabled the Naxxramas strategies previously removed. - Replaced core script header dependencies with observable checks (auras, casts, unit flags, flight state, etc.). - Split the Naxxramas action logic into per‑boss source files to avoid a “god file” and ease future maintenance. - Minor, non‑intrusive behavior improvements aligned with existing helpers. ### Future work Some strategies may still require refinement or more advanced handling later. This PR focuses on restoring the baseline logic without core dependencies, while keeping changes minimal and safe. **Any contributions are welcome to further improve and fine‑tune the Naxxramas strategies.** ### Testing Tested in some Naxx boxx. No server crash and boss killed :D Note: I'll make another PR with revised scripts when this one are merged --------- Co-authored-by: Keleborn <22352763+Celandriel@users.noreply.github.com> Co-authored-by: bash <hermensb@gmail.com> Co-authored-by: Revision <tkn963@gmail.com> Co-authored-by: kadeshar <kadeshar@gmail.com>
282 lines
11 KiB
C++
282 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/GruulsLair/RaidGruulsLairActionContext.h"
|
|
#include "Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h"
|
|
#include "Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h"
|
|
#include "Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h"
|
|
#include "Ai/Raid/Naxxramas/RaidNaxxActionContext.h"
|
|
#include "Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h"
|
|
#include "Ai/Raid/SerpentshrineCavern/RaidSSCActionContext.h"
|
|
#include "Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h"
|
|
#include "Ai/Raid/TempestKeep/RaidTempestKeepActionContext.h"
|
|
#include "Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.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 RaidGruulsLairActionContext());
|
|
actionContexts.Add(new RaidMagtheridonActionContext());
|
|
actionContexts.Add(new RaidNaxxActionContext());
|
|
actionContexts.Add(new RaidSSCActionContext());
|
|
actionContexts.Add(new RaidTempestKeepActionContext());
|
|
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 RaidGruulsLairTriggerContext());
|
|
triggerContexts.Add(new RaidMagtheridonTriggerContext());
|
|
triggerContexts.Add(new RaidNaxxTriggerContext());
|
|
triggerContexts.Add(new RaidSSCTriggerContext());
|
|
triggerContexts.Add(new RaidTempestKeepTriggerContext());
|
|
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();
|
|
}
|