mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-01-29 08:23:48 +00:00
[FIX] Folder restructure (#2018)
As requested Poll ``` 1. Yes 2. Yes 3. Maybe, but yes ``` --------- Co-authored-by: Celandriel <22352763+Celandriel@users.noreply.github.com>
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
#include "NewRpgInfo.h"
|
#include "NewRpgInfo.h"
|
||||||
#include "PlayerbotDungeonSuggestionMgr.h"
|
#include "PlayerbotDungeonRepository.h"
|
||||||
#include "PlayerbotFactory.h"
|
#include "PlayerbotFactory.h"
|
||||||
#include "Playerbots.h"
|
#include "Playerbots.h"
|
||||||
#include "PlayerbotGuildMgr.h"
|
#include "PlayerbotGuildMgr.h"
|
||||||
@@ -678,7 +678,7 @@ bool PlayerbotAIConfig::Initialize()
|
|||||||
|
|
||||||
if (sPlayerbotAIConfig->randomBotSuggestDungeons)
|
if (sPlayerbotAIConfig->randomBotSuggestDungeons)
|
||||||
{
|
{
|
||||||
sPlayerbotDungeonSuggestionMgr->LoadDungeonSuggestions();
|
sPlayerbotDungeonRepository->LoadDungeonSuggestions();
|
||||||
}
|
}
|
||||||
|
|
||||||
excludedHunterPetFamilies.clear();
|
excludedHunterPetFamilies.clear();
|
||||||
@@ -27,32 +27,32 @@
|
|||||||
#include "WarriorAiObjectContext.h"
|
#include "WarriorAiObjectContext.h"
|
||||||
#include "WorldPacketActionContext.h"
|
#include "WorldPacketActionContext.h"
|
||||||
#include "WorldPacketTriggerContext.h"
|
#include "WorldPacketTriggerContext.h"
|
||||||
#include "dungeons/DungeonStrategyContext.h"
|
#include "Extend/DungeonAi/DungeonStrategyContext.h"
|
||||||
#include "dungeons/wotlk/WotlkDungeonActionContext.h"
|
#include "Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h"
|
||||||
#include "dungeons/wotlk/WotlkDungeonTriggerContext.h"
|
#include "Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h"
|
||||||
#include "raids/RaidStrategyContext.h"
|
#include "Extend/RaidAi/RaidStrategyContext.h"
|
||||||
#include "raids/aq20/RaidAq20ActionContext.h"
|
#include "Extend/RaidAi/Aq20/RaidAq20ActionContext.h"
|
||||||
#include "raids/aq20/RaidAq20TriggerContext.h"
|
#include "Extend/RaidAi/Aq20/RaidAq20TriggerContext.h"
|
||||||
#include "raids/moltencore/RaidMcActionContext.h"
|
#include "Extend/RaidAi/MoltenCore/RaidMcActionContext.h"
|
||||||
#include "raids/moltencore/RaidMcTriggerContext.h"
|
#include "Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h"
|
||||||
#include "raids/blackwinglair/RaidBwlActionContext.h"
|
#include "Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h"
|
||||||
#include "raids/blackwinglair/RaidBwlTriggerContext.h"
|
#include "Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h"
|
||||||
#include "raids/karazhan/RaidKarazhanActionContext.h"
|
#include "Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h"
|
||||||
#include "raids/karazhan/RaidKarazhanTriggerContext.h"
|
#include "Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h"
|
||||||
#include "raids/magtheridon/RaidMagtheridonActionContext.h"
|
#include "Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h"
|
||||||
#include "raids/magtheridon/RaidMagtheridonTriggerContext.h"
|
#include "Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h"
|
||||||
#include "raids/gruulslair/RaidGruulsLairActionContext.h"
|
#include "Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h"
|
||||||
#include "raids/gruulslair/RaidGruulsLairTriggerContext.h"
|
#include "Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h"
|
||||||
#include "raids/eyeofeternity/RaidEoEActionContext.h"
|
#include "Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h"
|
||||||
#include "raids/eyeofeternity/RaidEoETriggerContext.h"
|
#include "Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h"
|
||||||
#include "raids/vaultofarchavon/RaidVoAActionContext.h"
|
#include "Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h"
|
||||||
#include "raids/vaultofarchavon/RaidVoATriggerContext.h"
|
#include "Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h"
|
||||||
#include "raids/obsidiansanctum/RaidOsActionContext.h"
|
#include "Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h"
|
||||||
#include "raids/obsidiansanctum/RaidOsTriggerContext.h"
|
#include "Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h"
|
||||||
#include "raids/onyxia/RaidOnyxiaActionContext.h"
|
#include "Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h"
|
||||||
#include "raids/onyxia/RaidOnyxiaTriggerContext.h"
|
#include "Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h"
|
||||||
#include "raids/icecrown/RaidIccActionContext.h"
|
#include "Extend/RaidAi/Icecrown/RaidIccActionContext.h"
|
||||||
#include "raids/icecrown/RaidIccTriggerContext.h"
|
#include "Extend/RaidAi/Icecrown/RaidIccTriggerContext.h"
|
||||||
|
|
||||||
SharedNamedObjectContextList<Strategy> AiObjectContext::sharedStrategyContexts;
|
SharedNamedObjectContextList<Strategy> AiObjectContext::sharedStrategyContexts;
|
||||||
SharedNamedObjectContextList<Action> AiObjectContext::sharedActionContexts;
|
SharedNamedObjectContextList<Action> AiObjectContext::sharedActionContexts;
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include "Action.h"
|
#include "Action.h"
|
||||||
#include "Event.h"
|
#include "Event.h"
|
||||||
#include "PerformanceMonitor.h"
|
#include "PerfMonitor.h"
|
||||||
#include "Playerbots.h"
|
#include "Playerbots.h"
|
||||||
#include "Queue.h"
|
#include "Queue.h"
|
||||||
#include "Strategy.h"
|
#include "Strategy.h"
|
||||||
@@ -204,7 +204,7 @@ bool Engine::DoNextAction(Unit* unit, uint32 depth, bool minimal)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_ACTION, action->getName(), &aiObjectContext->performanceStack);
|
PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_ACTION, action->getName(), &aiObjectContext->performanceStack);
|
||||||
actionExecuted = ListenAndExecute(action, event);
|
actionExecuted = ListenAndExecute(action, event);
|
||||||
if (pmo)
|
if (pmo)
|
||||||
pmo->finish();
|
pmo->finish();
|
||||||
@@ -456,8 +456,8 @@ void Engine::ProcessTriggers(bool minimal)
|
|||||||
if (minimal && node->getFirstRelevance() < 100)
|
if (minimal && node->getFirstRelevance() < 100)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
PerformanceMonitorOperation* pmo =
|
PerfMonitorOperation* pmo =
|
||||||
sPerformanceMonitor->start(PERF_MON_TRIGGER, trigger->getName(), &aiObjectContext->performanceStack);
|
sPerfMonitor->start(PERF_MON_TRIGGER, trigger->getName(), &aiObjectContext->performanceStack);
|
||||||
Event event = trigger->Check();
|
Event event = trigger->Check();
|
||||||
if (pmo)
|
if (pmo)
|
||||||
pmo->finish();
|
pmo->finish();
|
||||||
@@ -14,7 +14,7 @@ void PlayerbotAIBase::UpdateAI(uint32 elapsed, bool minimal)
|
|||||||
if (totalPmo)
|
if (totalPmo)
|
||||||
totalPmo->finish();
|
totalPmo->finish();
|
||||||
|
|
||||||
totalPmo = sPerformanceMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
|
totalPmo = sPerfMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
|
||||||
|
|
||||||
if (nextAICheckDelay > elapsed)
|
if (nextAICheckDelay > elapsed)
|
||||||
nextAICheckDelay -= elapsed;
|
nextAICheckDelay -= elapsed;
|
||||||
@@ -25,7 +25,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
uint32 nextAICheckDelay;
|
uint32 nextAICheckDelay;
|
||||||
class PerformanceMonitorOperation* totalPmo = nullptr;
|
class PerfMonitorOperation* totalPmo = nullptr;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool _isBotAI;
|
bool _isBotAI;
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include "Value.h"
|
#include "Value.h"
|
||||||
|
|
||||||
#include "PerformanceMonitor.h"
|
#include "PerfMonitor.h"
|
||||||
#include "Playerbots.h"
|
#include "Playerbots.h"
|
||||||
#include "Timer.h"
|
#include "Timer.h"
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ Unit* UnitCalculatedValue::Get()
|
|||||||
{
|
{
|
||||||
if (checkInterval < 2)
|
if (checkInterval < 2)
|
||||||
{
|
{
|
||||||
PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
|
PerfMonitorOperation* pmo = sPerfMonitor->start(
|
||||||
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
if (pmo)
|
if (pmo)
|
||||||
@@ -135,7 +135,7 @@ Unit* UnitCalculatedValue::Get()
|
|||||||
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
||||||
{
|
{
|
||||||
lastCheckTime = now;
|
lastCheckTime = now;
|
||||||
PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
|
PerfMonitorOperation* pmo = sPerfMonitor->start(
|
||||||
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
if (pmo)
|
if (pmo)
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include "AiObject.h"
|
#include "AiObject.h"
|
||||||
#include "ObjectGuid.h"
|
#include "ObjectGuid.h"
|
||||||
#include "PerformanceMonitor.h"
|
#include "PerfMonitor.h"
|
||||||
#include "Timer.h"
|
#include "Timer.h"
|
||||||
#include "Unit.h"
|
#include "Unit.h"
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ public:
|
|||||||
{
|
{
|
||||||
if (checkInterval < 2)
|
if (checkInterval < 2)
|
||||||
{
|
{
|
||||||
// PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
|
// PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
|
||||||
// this->context ? &this->context->performanceStack : nullptr);
|
// this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
// if (pmo)
|
// if (pmo)
|
||||||
@@ -84,7 +84,7 @@ public:
|
|||||||
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
||||||
{
|
{
|
||||||
lastCheckTime = now;
|
lastCheckTime = now;
|
||||||
// PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
|
// PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
|
||||||
// this->context ? &this->context->performanceStack : nullptr);
|
// this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
// if (pmo)
|
// if (pmo)
|
||||||
@@ -105,7 +105,7 @@ public:
|
|||||||
{
|
{
|
||||||
if (checkInterval < 2)
|
if (checkInterval < 2)
|
||||||
{
|
{
|
||||||
// PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
|
// PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
|
||||||
// this->context ? &this->context->performanceStack : nullptr);
|
// this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
// if (pmo)
|
// if (pmo)
|
||||||
@@ -117,7 +117,7 @@ public:
|
|||||||
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
if (!lastCheckTime || now - lastCheckTime >= checkInterval)
|
||||||
{
|
{
|
||||||
lastCheckTime = now;
|
lastCheckTime = now;
|
||||||
// PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
|
// PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
|
||||||
// this->context ? &this->context->performanceStack : nullptr);
|
// this->context ? &this->context->performanceStack : nullptr);
|
||||||
value = Calculate();
|
value = Calculate();
|
||||||
// if (pmo)
|
// if (pmo)
|
||||||
@@ -154,7 +154,7 @@ public:
|
|||||||
{
|
{
|
||||||
this->lastCheckTime = now;
|
this->lastCheckTime = now;
|
||||||
|
|
||||||
PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
|
PerfMonitorOperation* pmo = sPerfMonitor->start(
|
||||||
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
|
||||||
this->value = this->Calculate();
|
this->value = this->Calculate();
|
||||||
if (pmo)
|
if (pmo)
|
||||||
@@ -49,7 +49,7 @@ bool AcceptInvitationAction::Execute(Event event)
|
|||||||
if (sRandomPlayerbotMgr->IsRandomBot(bot))
|
if (sRandomPlayerbotMgr->IsRandomBot(bot))
|
||||||
botAI->SetMaster(inviter);
|
botAI->SetMaster(inviter);
|
||||||
// else
|
// else
|
||||||
// sPlayerbotDbStore->Save(botAI);
|
// sPlayerbotRepository->Save(botAI);
|
||||||
|
|
||||||
botAI->ResetStrategies();
|
botAI->ResetStrategies();
|
||||||
botAI->ChangeStrategy("+follow,-lfg,-bg", BOT_STATE_NON_COMBAT);
|
botAI->ChangeStrategy("+follow,-lfg,-bg", BOT_STATE_NON_COMBAT);
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "ChangeStrategyAction.h"
|
#include "ChangeStrategyAction.h"
|
||||||
|
|
||||||
#include "Event.h"
|
#include "Event.h"
|
||||||
#include "PlayerbotDbStore.h"
|
#include "PlayerbotRepository.h"
|
||||||
#include "Playerbots.h"
|
#include "Playerbots.h"
|
||||||
|
|
||||||
bool ChangeCombatStrategyAction::Execute(Event event)
|
bool ChangeCombatStrategyAction::Execute(Event event)
|
||||||
@@ -24,7 +24,7 @@ bool ChangeCombatStrategyAction::Execute(Event event)
|
|||||||
case '+':
|
case '+':
|
||||||
case '-':
|
case '-':
|
||||||
case '~':
|
case '~':
|
||||||
sPlayerbotDbStore->Save(botAI);
|
sPlayerbotRepository->Save(botAI);
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
break;
|
break;
|
||||||
@@ -62,7 +62,7 @@ bool ChangeNonCombatStrategyAction::Execute(Event event)
|
|||||||
case '+':
|
case '+':
|
||||||
case '-':
|
case '-':
|
||||||
case '~':
|
case '~':
|
||||||
sPlayerbotDbStore->Save(botAI);
|
sPlayerbotRepository->Save(botAI);
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
break;
|
break;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user