Add whirlwind to arms warrior strategy

cmangos · May 28, 2024 · 4084221 · 4084221
1 parent e440df4
commit 4084221
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 48 deletions.
diff --git a/playerbot/strategy/warrior/ArmsWarriorStrategy.cpp b/playerbot/strategy/warrior/ArmsWarriorStrategy.cpp
@@ -15,6 +15,7 @@ class ArmsWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNod
         creators["mocking blow"] = &mocking_blow;
         creators["heroic strike"] = &heroic_strike;
         creators["mortal strike"] = &mortal_strike;
+        creators["whirlwind"] = &whirlwind;
     }
 
 private:
@@ -29,6 +30,8 @@ class ArmsWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNod
     ACTION_NODE_A(heroic_strike, "heroic strike", "melee");
 
     ACTION_NODE_A(mortal_strike, "mortal strike", "heroic strike");
+
+    ACTION_NODE_P(whirlwind, "whirlwind", "berserker stance");
 };
 
 ArmsWarriorStrategy::ArmsWarriorStrategy(PlayerbotAI* ai) : WarriorStrategy(ai)
@@ -63,6 +66,10 @@ void ArmsWarriorStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
         "overpower",
         NextAction::array(0, new NextAction("overpower", ACTION_HIGH), NULL)));
 
+    triggers.push_back(new TriggerNode(
+        "whirlwind",
+        NextAction::array(0, new NextAction("whirlwind", ACTION_NORMAL + 3), NULL)));
+
     triggers.push_back(new TriggerNode(
         "medium rage available",
         NextAction::array(0, new NextAction("heroic strike", ACTION_NORMAL + 2), NULL)));
@@ -169,11 +176,11 @@ void ArmsWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigger
 
     triggers.push_back(new TriggerNode(
         "melee light aoe",
-        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH), NULL)));
+        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 5), NULL)));
 
     triggers.push_back(new TriggerNode(
-        "melee light aoe",
-        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 4), NULL)));
 }
 
 void ArmsWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -830,15 +837,11 @@ void ArmsWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigger
 
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
-        NextAction::array(0, new NextAction("bladestorm", ACTION_HIGH + 1), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee light aoe",
-        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH), NULL)));
+        NextAction::array(0, new NextAction("bladestorm", ACTION_HIGH + 5), NULL)));
 
     triggers.push_back(new TriggerNode(
         "melee light aoe",
-        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
+        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 4), NULL)));
 }
 
 void ArmsWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)

diff --git a/playerbot/strategy/warrior/FuryWarriorStrategy.cpp b/playerbot/strategy/warrior/FuryWarriorStrategy.cpp
@@ -160,6 +160,14 @@ void FuryWarriorRaidStrategy::InitDeadTriggers(std::list<TriggerNode*>& triggers
 void FuryWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     WarriorAoeStrategy::InitCombatTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 4), NULL)));
 }
 
 void FuryWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -504,6 +512,14 @@ void FuryWarriorRaidStrategy::InitDeadTriggers(std::list<TriggerNode*>& triggers
 void FuryWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     WarriorAoeStrategy::InitCombatTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 4), NULL)));
 }
 
 void FuryWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -857,6 +873,14 @@ void FuryWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigger
 void FuryWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     WarriorAoeStrategy::InitNonCombatTriggers(triggers);
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 5), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee medium aoe",
+        NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 4), NULL)));
 }
 
 void FuryWarriorAoePveStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)

diff --git a/playerbot/strategy/warrior/ProtectionWarriorStrategy.cpp b/playerbot/strategy/warrior/ProtectionWarriorStrategy.cpp
@@ -231,10 +231,6 @@ void ProtectionWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& t
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
         NextAction::array(0, new NextAction("battle shout taunt", ACTION_HIGH), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee light aoe",
-        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void ProtectionWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -635,10 +631,6 @@ void ProtectionWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& t
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
         NextAction::array(0, new NextAction("battle shout taunt", ACTION_HIGH), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee light aoe",
-        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void ProtectionWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -1027,10 +1019,6 @@ void ProtectionWarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& t
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
         NextAction::array(0, new NextAction("battle shout taunt", ACTION_HIGH), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee light aoe",
-        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void ProtectionWarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)

diff --git a/playerbot/strategy/warrior/WarriorStrategy.cpp b/playerbot/strategy/warrior/WarriorStrategy.cpp
@@ -20,7 +20,6 @@ class WarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
         // berserker only
         creators["berserker rage"] = &berserker_rage;
         creators["recklessness"] = &recklessness;
-        creators["whirlwind"] = &whirlwind;
         creators["pummel"] = &pummel;
         creators["intercept"] = &intercept;
 
@@ -49,8 +48,6 @@ class WarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNode>
 
     ACTION_NODE_P(recklessness, "recklessness", "berserker stance");
 
-    ACTION_NODE_P(whirlwind, "whirlwind", "berserker stance");
-
     ACTION_NODE_P(pummel, "pummel", "berserker stance");
 
     ACTION_NODE_P(intercept, "intercept", "berserker stance");
@@ -166,23 +163,19 @@ void WarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
-        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 6), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee medium aoe",
-        NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 5), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee medium aoe",
-        NextAction::array(0, new NextAction("cleave", ACTION_HIGH + 4), NULL)));
+        NextAction::array(0, new NextAction("cleave", ACTION_HIGH + 3), NULL)));
 
     triggers.push_back(new TriggerNode(
         "thunder clap",
-        NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 3), NULL)));
+        NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), NULL)));
 
     triggers.push_back(new TriggerNode(
         "thunder clap on snare target",
-        NextAction::array(0, new NextAction("thunder clap on snare target", ACTION_HIGH + 2), NULL)));
+        NextAction::array(0, new NextAction("thunder clap on snare target", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee light aoe",
+        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void WarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -461,15 +454,7 @@ void WarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 
     triggers.push_back(new TriggerNode(
         "melee light aoe",
-        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 6), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee medium aoe",
-        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 5), NULL)));
-
-    triggers.push_back(new TriggerNode(
-        "melee medium aoe",
-        NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 4), NULL)));
+        NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 4), NULL)));
 
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
@@ -482,6 +467,10 @@ void WarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
     triggers.push_back(new TriggerNode(
         "thunder clap on snare target",
         NextAction::array(0, new NextAction("thunder clap on snare target", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee light aoe",
+        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void WarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -754,10 +743,6 @@ void WarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     AoeStrategy::InitCombatTriggers(triggers);
 
-    triggers.push_back(new TriggerNode(
-        "melee medium aoe",
-        NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 4), NULL)));
-
     triggers.push_back(new TriggerNode(
         "melee medium aoe",
         NextAction::array(0, new NextAction("cleave", ACTION_HIGH + 3), NULL)));
@@ -769,6 +754,10 @@ void WarriorAoeStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
     triggers.push_back(new TriggerNode(
         "thunder clap on snare target",
         NextAction::array(0, new NextAction("thunder clap on snare target", ACTION_HIGH + 1), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "melee light aoe",
+        NextAction::array(0, new NextAction("oil of immolation", ACTION_HIGH), NULL)));
 }
 
 void WarriorAoeStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)