diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp index 39e395bf..310a11f2 100644 --- a/src/AiFactory.cpp +++ b/src/AiFactory.cpp @@ -307,21 +307,12 @@ void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const fa break; case CLASS_PALADIN: if (tab == 1) - engine->addStrategies("tank", "tank assist", "bthreat", "cure", "baoe", "bstats", "close", nullptr); + engine->addStrategies("tank", "tank assist", "bthreat", "barmor", "cure", "close", nullptr); else if (tab == 0) - engine->addStrategies("heal", "bmana", "dps assist", "cure", nullptr); + engine->addStrategies("heal", "dps assist", "baoe", "cure", nullptr); else - engine->addStrategies("dps", "bdps", "dps assist", "cure", "close", nullptr); + engine->addStrategies("dps", "dps assist", "cure", "close", nullptr); - if (player->getLevel() < 14) - { - engine->addStrategy("bdps"); - } - - if (player->getLevel() < 16) - { - engine->addStrategy("barmor"); - } break; case CLASS_DRUID: if (tab == 0) @@ -475,19 +466,13 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const break; case CLASS_PALADIN: if (tab == 1) - nonCombatEngine->addStrategies("bthreat", "tank assist", "baoe", "bstats", nullptr); + nonCombatEngine->addStrategies("bthreat", "tank assist", "bstats", "barmor", nullptr); else if (tab == 0) nonCombatEngine->addStrategies("dps assist", "bmana", nullptr); else - nonCombatEngine->addStrategies("dps assist", "bdps", nullptr); + nonCombatEngine->addStrategies("dps assist", "bdps", "baoe", nullptr); nonCombatEngine->addStrategies("cure", nullptr); - - if (player->getLevel() < 14) - nonCombatEngine->addStrategies("bdps", nullptr); - - if (player->getLevel() < 16) - nonCombatEngine->addStrategies("barmor", nullptr); break; case CLASS_HUNTER: nonCombatEngine->addStrategies("bdps", "dps assist", "pet", nullptr); diff --git a/src/strategy/deathknight/BloodDKStrategy.cpp b/src/strategy/deathknight/BloodDKStrategy.cpp index c3b8e23e..f3bc07a2 100644 --- a/src/strategy/deathknight/BloodDKStrategy.cpp +++ b/src/strategy/deathknight/BloodDKStrategy.cpp @@ -83,9 +83,9 @@ NextAction** BloodDKStrategy::getDefaultActions() new NextAction("rune strike", ACTION_NORMAL + 7), new NextAction("icy touch", ACTION_NORMAL + 6), new NextAction("heart strike", ACTION_NORMAL + 5), - new NextAction("death coil", ACTION_NORMAL + 4), - new NextAction("plague strike", ACTION_NORMAL + 3), - new NextAction("blood strike", ACTION_NORMAL + 2), + new NextAction("blood strike", ACTION_NORMAL + 4), + new NextAction("death coil", ACTION_NORMAL + 3), + new NextAction("plague strike", ACTION_NORMAL + 2), new NextAction("melee", ACTION_NORMAL), NULL); } diff --git a/src/strategy/paladin/DpsPaladinStrategy.cpp b/src/strategy/paladin/DpsPaladinStrategy.cpp index e7e385c5..c4d0bf47 100644 --- a/src/strategy/paladin/DpsPaladinStrategy.cpp +++ b/src/strategy/paladin/DpsPaladinStrategy.cpp @@ -86,7 +86,7 @@ void DpsPaladinStrategy::InitTriggers(std::vector& triggers) NextAction::array(0, new NextAction("seal of vengeance", 89.0f), NULL))); // triggers.push_back(new TriggerNode("seal", NextAction::array(0, new NextAction("seal of command", 90.0f), nullptr))); triggers.push_back(new TriggerNode("low mana", NextAction::array(0, new NextAction("seal of wisdom", 91.0f), nullptr))); - triggers.push_back(new TriggerNode("sanctity aura", NextAction::array(0, new NextAction("sanctity aura", 90.0f), nullptr))); + // triggers.push_back(new TriggerNode("sanctity aura", NextAction::array(0, new NextAction("sanctity aura", 90.0f), nullptr))); // triggers.push_back(new TriggerNode("low health", NextAction::array(0, new NextAction("repentance or shield", ACTION_CRITICAL_HEAL + 3), new NextAction("holy light", ACTION_CRITICAL_HEAL + 2), nullptr))); // triggers.push_back(new TriggerNode("judgement of wisdom", NextAction::array(0, new NextAction("judgement of wisdom", ACTION_NORMAL + 10), nullptr))); // triggers.push_back(new TriggerNode("judgement", NextAction::array(0, new NextAction("judgement", ACTION_HIGH + 10), nullptr))); diff --git a/src/strategy/paladin/PaladinBuffStrategies.cpp b/src/strategy/paladin/PaladinBuffStrategies.cpp index 65ce9404..10131b10 100644 --- a/src/strategy/paladin/PaladinBuffStrategies.cpp +++ b/src/strategy/paladin/PaladinBuffStrategies.cpp @@ -51,7 +51,6 @@ void PaladinBuffAoeStrategy::InitTriggers(std::vector& triggers) void PaladinBuffThreatStrategy::InitTriggers(std::vector& triggers) { triggers.push_back(new TriggerNode("righteous fury", NextAction::array(0, new NextAction("righteous fury", ACTION_HIGH + 8), nullptr))); - } void PaladinBuffStatsStrategy::InitTriggers(std::vector& triggers) diff --git a/src/strategy/paladin/TankPaladinStrategy.cpp b/src/strategy/paladin/TankPaladinStrategy.cpp index c0e13064..8ef67167 100644 --- a/src/strategy/paladin/TankPaladinStrategy.cpp +++ b/src/strategy/paladin/TankPaladinStrategy.cpp @@ -47,14 +47,14 @@ void TankPaladinStrategy::InitTriggers(std::vector& triggers) { GenericPaladinStrategy::InitTriggers(triggers); - triggers.push_back(new TriggerNode("seal", NextAction::array(0, new NextAction("seal of command", 90.0f), NULL))); + triggers.push_back(new TriggerNode("seal", NextAction::array(0, new NextAction("seal of command", 90.0f), nullptr))); triggers.push_back(new TriggerNode("low mana", NextAction::array(0, new NextAction("seal of wisdom", 91.0f), nullptr))); - triggers.push_back(new TriggerNode( - "devotion aura", - NextAction::array(0, new NextAction("devotion aura", 90.0f), NULL))); + // triggers.push_back(new TriggerNode("devotion aura", NextAction::array(0, new NextAction("devotion aura", 90.0f), NULL))); triggers.push_back(new TriggerNode("light aoe", NextAction::array(0, new NextAction("avenger's shield", ACTION_HIGH + 5), nullptr))); - triggers.push_back(new TriggerNode("medium aoe", NextAction::array(0, new NextAction("consecration", ACTION_HIGH + 7), new NextAction("avenger's shield", ACTION_HIGH + 6), NULL))); + triggers.push_back(new TriggerNode("medium aoe", NextAction::array(0, + new NextAction("consecration", ACTION_HIGH + 7), + new NextAction("avenger's shield", ACTION_HIGH + 6), nullptr))); // triggers.push_back(new TriggerNode("avenger's shield", NextAction::array(0, new NextAction("avenger's shield", ACTION_HIGH + 7), nullptr))); triggers.push_back(new TriggerNode("lose aggro", NextAction::array(0, new NextAction("hand of reckoning", ACTION_HIGH + 7), nullptr))); triggers.push_back(new TriggerNode("holy shield", NextAction::array(0, new NextAction("holy shield", ACTION_HIGH + 4), nullptr))); @@ -62,11 +62,11 @@ void TankPaladinStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode("target critical health", NextAction::array(0, new NextAction("hammer of wrath", ACTION_CRITICAL_HEAL), nullptr))); triggers.push_back(new TriggerNode( "righteous fury", - NextAction::array(0, new NextAction("righteous fury", ACTION_HIGH + 8), NULL))); + NextAction::array(0, new NextAction("righteous fury", ACTION_HIGH + 8), nullptr))); triggers.push_back(new TriggerNode( "not facing target", - NextAction::array(0, new NextAction("set facing", ACTION_NORMAL + 7), NULL))); + NextAction::array(0, new NextAction("set facing", ACTION_NORMAL + 7), nullptr))); triggers.push_back(new TriggerNode( "enemy out of melee", - NextAction::array(0, new NextAction("reach melee", ACTION_NORMAL + 8), NULL))); + NextAction::array(0, new NextAction("reach melee", ACTION_NORMAL + 8), nullptr))); } diff --git a/src/strategy/priest/HealPriestStrategy.cpp b/src/strategy/priest/HealPriestStrategy.cpp index 876889b9..25351a3e 100644 --- a/src/strategy/priest/HealPriestStrategy.cpp +++ b/src/strategy/priest/HealPriestStrategy.cpp @@ -80,10 +80,10 @@ void HealPriestStrategy::InitTriggers(std::vector& triggers) // triggers.push_back(new TriggerNode("party member almost full health", NextAction::array(0, new NextAction("heal on party", 41.0f), new NextAction("renew on party", 40.0f), nullptr))); // triggers.push_back(new TriggerNode("party member medium health", NextAction::array(0, new NextAction("greater heal on party", 47.0f), nullptr))); // triggers.push_back(new TriggerNode("party member low health", NextAction::array(0, new NextAction("power word: shield on party", 51.0f), new NextAction("greater heal on party", 50.0f), nullptr))); - triggers.push_back(new TriggerNode("party member to heal out of spell range", NextAction::array(0, new NextAction("reach party member to heal", ACTION_CRITICAL_HEAL), nullptr))); + triggers.push_back(new TriggerNode("party member to heal out of spell range", NextAction::array(0, new NextAction("reach party member to heal", ACTION_CRITICAL_HEAL + 10), nullptr))); // triggers.push_back(new TriggerNode("medium aoe heal", NextAction::array(0, new NextAction("prayer of mending", 49.0f), nullptr))); // triggers.push_back(new TriggerNode("medium aoe heal", NextAction::array(0, new NextAction("circle of healing", 48.0f), nullptr))); - triggers.push_back(new TriggerNode("binding heal", NextAction::array(0, new NextAction("binding heal", 52.0f), nullptr))); + // triggers.push_back(new TriggerNode("binding heal", NextAction::array(0, new NextAction("binding heal", 52.0f), nullptr))); // triggers.push_back(new TriggerNode("low mana", NextAction::array(0, new NextAction("shadowfiend", ACTION_HIGH), nullptr))); triggers.push_back(new TriggerNode("critical health", NextAction::array(0, new NextAction("pain suppression", ACTION_EMERGENCY + 1), nullptr)));