diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp index c03cd615..d3cd1ef3 100644 --- a/src/AiFactory.cpp +++ b/src/AiFactory.cpp @@ -394,7 +394,7 @@ void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const fa { if (sPlayerbotAIConfig->autoSaveMana) engine->addStrategy("save mana", false); - engine->addStrategy("assist dps", false); + engine->addStrategy("healer dps", false); } if (facade->IsRealPlayer() || sRandomPlayerbotMgr->IsRandomBot(player)) { diff --git a/src/strategy/druid/DruidAiObjectContext.cpp b/src/strategy/druid/DruidAiObjectContext.cpp index d9882c76..e0d8c7de 100644 --- a/src/strategy/druid/DruidAiObjectContext.cpp +++ b/src/strategy/druid/DruidAiObjectContext.cpp @@ -34,7 +34,7 @@ public: creators["buff"] = &DruidStrategyFactoryInternal::buff; creators["boost"] = &DruidStrategyFactoryInternal::boost; creators["cc"] = &DruidStrategyFactoryInternal::cc; - creators["assist dps"] = &DruidStrategyFactoryInternal::assist_dps; + creators["healer dps"] = &DruidStrategyFactoryInternal::healer_dps; } private: @@ -47,7 +47,7 @@ private: static Strategy* buff(PlayerbotAI* botAI) { return new GenericDruidBuffStrategy(botAI); } static Strategy* boost(PlayerbotAI* botAI) { return new DruidBoostStrategy(botAI); } static Strategy* cc(PlayerbotAI* botAI) { return new DruidCcStrategy(botAI); } - static Strategy* assist_dps(PlayerbotAI* botAI) { return new DruidAssistDpsStrategy(botAI); } + static Strategy* healer_dps(PlayerbotAI* botAI) { return new DruidHealerDpsStrategy(botAI); } }; class DruidDruidStrategyFactoryInternal : public NamedObjectContext diff --git a/src/strategy/druid/GenericDruidStrategy.cpp b/src/strategy/druid/GenericDruidStrategy.cpp index cbe3ad7a..d06a0e56 100644 --- a/src/strategy/druid/GenericDruidStrategy.cpp +++ b/src/strategy/druid/GenericDruidStrategy.cpp @@ -153,7 +153,7 @@ void DruidCcStrategy::InitTriggers(std::vector& triggers) "hibernate", NextAction::array(0, new NextAction("hibernate on cc", ACTION_HIGH + 3), nullptr))); } -void DruidAssistDpsStrategy::InitTriggers(std::vector& triggers) +void DruidHealerDpsStrategy::InitTriggers(std::vector& triggers) { triggers.push_back( new TriggerNode("healer should attack", diff --git a/src/strategy/druid/GenericDruidStrategy.h b/src/strategy/druid/GenericDruidStrategy.h index 6099527e..547b93b0 100644 --- a/src/strategy/druid/GenericDruidStrategy.h +++ b/src/strategy/druid/GenericDruidStrategy.h @@ -46,13 +46,13 @@ public: std::string const getName() override { return "cc"; } }; -class DruidAssistDpsStrategy : public Strategy +class DruidHealerDpsStrategy : public Strategy { public: - DruidAssistDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} + DruidHealerDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} void InitTriggers(std::vector& triggers) override; - std::string const getName() override { return "assist dps"; } + std::string const getName() override { return "healer dps"; } }; #endif diff --git a/src/strategy/paladin/GenericPaladinStrategy.cpp b/src/strategy/paladin/GenericPaladinStrategy.cpp index 09eb2074..b5b77f58 100644 --- a/src/strategy/paladin/GenericPaladinStrategy.cpp +++ b/src/strategy/paladin/GenericPaladinStrategy.cpp @@ -72,7 +72,7 @@ void PaladinCcStrategy::InitTriggers(std::vector& triggers) new TriggerNode("turn undead", NextAction::array(0, new NextAction("turn undead", ACTION_HIGH + 1), nullptr))); } -void PaladinAssistDpsStrategy::InitTriggers(std::vector& triggers) +void PaladinHealerDpsStrategy::InitTriggers(std::vector& triggers) { triggers.push_back( new TriggerNode("healer should attack", diff --git a/src/strategy/paladin/GenericPaladinStrategy.h b/src/strategy/paladin/GenericPaladinStrategy.h index fcdef3c6..737048cc 100644 --- a/src/strategy/paladin/GenericPaladinStrategy.h +++ b/src/strategy/paladin/GenericPaladinStrategy.h @@ -46,13 +46,13 @@ public: std::string const getName() override { return "cc"; } }; -class PaladinAssistDpsStrategy : public Strategy +class PaladinHealerDpsStrategy : public Strategy { public: - PaladinAssistDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} + PaladinHealerDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} void InitTriggers(std::vector& triggers) override; - std::string const getName() override { return "assist dps"; } + std::string const getName() override { return "healer dps"; } }; #endif diff --git a/src/strategy/paladin/PaladinAiObjectContext.cpp b/src/strategy/paladin/PaladinAiObjectContext.cpp index 5bc056ba..42e89a8a 100644 --- a/src/strategy/paladin/PaladinAiObjectContext.cpp +++ b/src/strategy/paladin/PaladinAiObjectContext.cpp @@ -25,7 +25,7 @@ public: creators["boost"] = &PaladinStrategyFactoryInternal::boost; creators["cc"] = &PaladinStrategyFactoryInternal::cc; creators["bthreat"] = &PaladinStrategyFactoryInternal::bthreat; - creators["assist dps"] = &PaladinStrategyFactoryInternal::assist_dps; + creators["healer dps"] = &PaladinStrategyFactoryInternal::healer_dps; } private: @@ -34,7 +34,7 @@ private: static Strategy* boost(PlayerbotAI* botAI) { return new PaladinBoostStrategy(botAI); } static Strategy* cc(PlayerbotAI* botAI) { return new PaladinCcStrategy(botAI); } static Strategy* bthreat(PlayerbotAI* botAI) { return new PaladinBuffThreatStrategy(botAI); } - static Strategy* assist_dps(PlayerbotAI* botAI) { return new PaladinAssistDpsStrategy(botAI); } + static Strategy* healer_dps(PlayerbotAI* botAI) { return new PaladinHealerDpsStrategy(botAI); } }; class PaladinResistanceStrategyFactoryInternal : public NamedObjectContext diff --git a/src/strategy/priest/GenericPriestStrategy.cpp b/src/strategy/priest/GenericPriestStrategy.cpp index fa680424..82ca65e9 100644 --- a/src/strategy/priest/GenericPriestStrategy.cpp +++ b/src/strategy/priest/GenericPriestStrategy.cpp @@ -88,7 +88,7 @@ void PriestCcStrategy::InitTriggers(std::vector& triggers) new TriggerNode("shackle undead", NextAction::array(0, new NextAction("shackle undead", 31.0f), nullptr))); } -void PriestAssistDpsStrategy::InitTriggers(std::vector& triggers) +void PriestHealerDpsStrategy::InitTriggers(std::vector& triggers) { triggers.push_back( new TriggerNode("healer should attack", diff --git a/src/strategy/priest/GenericPriestStrategy.h b/src/strategy/priest/GenericPriestStrategy.h index f18e2b00..2668723e 100644 --- a/src/strategy/priest/GenericPriestStrategy.h +++ b/src/strategy/priest/GenericPriestStrategy.h @@ -46,13 +46,13 @@ public: std::string const getName() override { return "cc"; } }; -class PriestAssistDpsStrategy : public Strategy +class PriestHealerDpsStrategy : public Strategy { public: - PriestAssistDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} + PriestHealerDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} void InitTriggers(std::vector& triggers) override; - std::string const getName() override { return "assist dps"; } + std::string const getName() override { return "healer dps"; } }; #endif diff --git a/src/strategy/priest/PriestAiObjectContext.cpp b/src/strategy/priest/PriestAiObjectContext.cpp index 3f8dbacd..4f057718 100644 --- a/src/strategy/priest/PriestAiObjectContext.cpp +++ b/src/strategy/priest/PriestAiObjectContext.cpp @@ -31,7 +31,7 @@ public: creators["boost"] = &PriestStrategyFactoryInternal::boost; creators["rshadow"] = &PriestStrategyFactoryInternal::rshadow; creators["cc"] = &PriestStrategyFactoryInternal::cc; - creators["assist dps"] = &PriestStrategyFactoryInternal::assist_dps; + creators["healer dps"] = &PriestStrategyFactoryInternal::healer_dps; } private: @@ -44,7 +44,7 @@ private: static Strategy* pull(PlayerbotAI* botAI) { return new PullStrategy(botAI, "shoot"); } static Strategy* shadow_debuff(PlayerbotAI* botAI) { return new ShadowPriestDebuffStrategy(botAI); } static Strategy* cure(PlayerbotAI* botAI) { return new PriestCureStrategy(botAI); } - static Strategy* assist_dps(PlayerbotAI* botAI) { return new PriestAssistDpsStrategy(botAI); } + static Strategy* healer_dps(PlayerbotAI* botAI) { return new PriestHealerDpsStrategy(botAI); } }; class PriestCombatStrategyFactoryInternal : public NamedObjectContext diff --git a/src/strategy/shaman/GenericShamanStrategy.cpp b/src/strategy/shaman/GenericShamanStrategy.cpp index 430a1bdc..95ed14f2 100644 --- a/src/strategy/shaman/GenericShamanStrategy.cpp +++ b/src/strategy/shaman/GenericShamanStrategy.cpp @@ -164,7 +164,7 @@ void ShamanCureStrategy::InitTriggers(std::vector& triggers) NextAction::array(0, new NextAction("cleanse spirit curse on party", 23.0f), nullptr))); } -void ShamanAssistDpsStrategy::InitTriggers(std::vector& triggers) +void ShamanHealerDpsStrategy::InitTriggers(std::vector& triggers) { triggers.push_back( new TriggerNode("healer should attack", diff --git a/src/strategy/shaman/GenericShamanStrategy.h b/src/strategy/shaman/GenericShamanStrategy.h index d41b8c04..5fa0ff83 100644 --- a/src/strategy/shaman/GenericShamanStrategy.h +++ b/src/strategy/shaman/GenericShamanStrategy.h @@ -45,13 +45,13 @@ public: std::string const getName() override { return "cure"; } }; -class ShamanAssistDpsStrategy : public Strategy +class ShamanHealerDpsStrategy : public Strategy { public: - ShamanAssistDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} + ShamanHealerDpsStrategy(PlayerbotAI* botAI) : Strategy(botAI) {} void InitTriggers(std::vector& triggers) override; - std::string const getName() override { return "assist dps"; } + std::string const getName() override { return "healer dps"; } }; #endif diff --git a/src/strategy/shaman/ShamanAiObjectContext.cpp b/src/strategy/shaman/ShamanAiObjectContext.cpp index 193d292a..9e79f792 100644 --- a/src/strategy/shaman/ShamanAiObjectContext.cpp +++ b/src/strategy/shaman/ShamanAiObjectContext.cpp @@ -26,7 +26,7 @@ public: creators["melee aoe"] = &ShamanStrategyFactoryInternal::melee_aoe; creators["caster aoe"] = &ShamanStrategyFactoryInternal::caster_aoe; creators["cure"] = &ShamanStrategyFactoryInternal::cure; - creators["assist dps"] = &ShamanStrategyFactoryInternal::assist_dps; + creators["healer dps"] = &ShamanStrategyFactoryInternal::healer_dps; } private: @@ -35,7 +35,7 @@ private: static Strategy* melee_aoe(PlayerbotAI* botAI) { return new MeleeAoeShamanStrategy(botAI); } static Strategy* caster_aoe(PlayerbotAI* botAI) { return new CasterAoeShamanStrategy(botAI); } static Strategy* cure(PlayerbotAI* botAI) { return new ShamanCureStrategy(botAI); } - static Strategy* assist_dps(PlayerbotAI* botAI) { return new ShamanAssistDpsStrategy(botAI); } + static Strategy* healer_dps(PlayerbotAI* botAI) { return new ShamanHealerDpsStrategy(botAI); } }; class ShamanBuffStrategyFactoryInternal : public NamedObjectContext