From 920b3c7b08bf8d3671e502477bf2bc8abfa3866b Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 15:00:55 +1100 Subject: [PATCH 01/15] Lowered Heroic Strike priority --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index c77e25c2..35b608d5 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -64,7 +64,7 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode( "victory rush", NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); triggers.push_back(new TriggerNode( - "high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH + 10), nullptr))); + "high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), nullptr))); triggers.push_back(new TriggerNode("medium rage available", NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), new NextAction("thunder clap", ACTION_HIGH), From 68b48ce5730d7a9180e973e1cc8967fac1455734 Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 15:45:10 +1100 Subject: [PATCH 02/15] Adjusted priorities --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 38 ++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index 35b608d5..2f5ac44c 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -44,40 +44,42 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) GenericWarriorStrategy::InitTriggers(triggers); triggers.push_back(new TriggerNode("enemy out of melee", - NextAction::array(0, new NextAction("charge", ACTION_MOVE + 9), nullptr))); + NextAction::array(0, new NextAction("charge", ACTION_MOVE + 10), nullptr))); triggers.push_back(new TriggerNode( - "battle stance", NextAction::array(0, new NextAction("battle stance", ACTION_HIGH + 9), nullptr))); + "battle stance", NextAction::array(0, new NextAction("battle stance", ACTION_HIGH + 10), nullptr))); triggers.push_back(new TriggerNode("battle shout", - NextAction::array(0, new NextAction("battle shout", ACTION_HIGH + 8), nullptr))); + NextAction::array(0, new NextAction("battle shout", ACTION_HIGH + 9), nullptr))); triggers.push_back(new TriggerNode( - "mortal strike", NextAction::array(0, new NextAction("mortal strike", ACTION_HIGH + 1), nullptr))); + "mortal strike", NextAction::array(0, new NextAction("mortal strike", ACTION_HIGH + 3), nullptr))); triggers.push_back(new TriggerNode("target critical health", - NextAction::array(0, new NextAction("execute", ACTION_HIGH + 4), nullptr))); + NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); triggers.push_back( - new TriggerNode("sudden death", NextAction::array(0, new NextAction("execute", ACTION_HIGH + 4), nullptr))); + new TriggerNode("sudden death", NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); triggers.push_back( new TriggerNode("hamstring", NextAction::array(0, new NextAction("piercing howl", ACTION_HIGH), nullptr))); triggers.push_back( - new TriggerNode("overpower", NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 3), nullptr))); + new TriggerNode("overpower", NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); triggers.push_back(new TriggerNode("taste for blood", - NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 3), nullptr))); + NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); triggers.push_back(new TriggerNode( "victory rush", NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); - triggers.push_back(new TriggerNode( - "high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), nullptr))); - triggers.push_back(new TriggerNode("medium rage available", - NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), - new NextAction("thunder clap", ACTION_HIGH), - nullptr))); + triggers.push_back(new TriggerNode("high rage available", + NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), + NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), + nullptr))); + // triggers.push_back(new TriggerNode("medium rage available", + // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), + // new NextAction("thunder clap", ACTION_HIGH), + // nullptr))); triggers.push_back( new TriggerNode("bloodrage", NextAction::array(0, new NextAction("bloodrage", ACTION_HIGH + 2), nullptr))); triggers.push_back( new TriggerNode("death wish", NextAction::array(0, new NextAction("death wish", ACTION_HIGH + 2), nullptr))); - triggers.push_back(new TriggerNode("rend", NextAction::array(0, new NextAction("rend", ACTION_HIGH + 5), nullptr))); + triggers.push_back(new TriggerNode("rend", NextAction::array(0, new NextAction("rend", ACTION_HIGH + 8), nullptr))); triggers.push_back(new TriggerNode( - "rend on attacker", NextAction::array(0, new NextAction("rend on attacker", ACTION_HIGH + 5), nullptr))); + "rend on attacker", NextAction::array(0, new NextAction("rend on attacker", ACTION_HIGH + 8), nullptr))); triggers.push_back(new TriggerNode( "critical health", NextAction::array(0, new NextAction("intimidating shout", ACTION_EMERGENCY), nullptr))); - triggers.push_back(new TriggerNode("medium aoe", - NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), nullptr))); + // triggers.push_back(new TriggerNode("medium aoe", + // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), nullptr))); } From 85efe3fbbd79f8aa5adad927674a0f056be43b9b Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 15:45:19 +1100 Subject: [PATCH 03/15] Adjusted priorities --- src/strategy/warrior/GenericWarriorStrategy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/strategy/warrior/GenericWarriorStrategy.cpp index 3b5588ea..a1132641 100644 --- a/src/strategy/warrior/GenericWarriorStrategy.cpp +++ b/src/strategy/warrior/GenericWarriorStrategy.cpp @@ -50,8 +50,8 @@ void WarrirorAoeStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode( "light aoe", NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 5), new NextAction("shockwave", ACTION_HIGH + 4), - new NextAction("sweeping strikes", ACTION_HIGH + 3), - new NextAction("bladestorm", ACTION_HIGH + 3), + new NextAction("sweeping strikes", ACTION_HIGH + 7), + new NextAction("bladestorm", ACTION_HIGH + 6), // new NextAction("whirlwind", ACTION_HIGH + 2), new NextAction("demoralizing shout without life time check", ACTION_HIGH + 1), new NextAction("cleave", ACTION_HIGH), nullptr))); From 6eef4106897d3aeaa7ee28cc9365fc4a600ff392 Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 15:47:38 +1100 Subject: [PATCH 04/15] Missing ) --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index 2f5ac44c..a1c8324b 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -66,7 +66,7 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode("high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), - nullptr))); + nullptr)))); // triggers.push_back(new TriggerNode("medium rage available", // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), // new NextAction("thunder clap", ACTION_HIGH), From 9f1b9df9d18194b39d0f12a085732cceadff8017 Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 15:55:04 +1100 Subject: [PATCH 05/15] Update ArmsWarriorStrategy.cpp --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index a1c8324b..732e025d 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -65,8 +65,8 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) "victory rush", NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); triggers.push_back(new TriggerNode("high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), - NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), - nullptr)))); + new NextAction("slam", ACTION_HIGH + 1), + nullptr))); // triggers.push_back(new TriggerNode("medium rage available", // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), // new NextAction("thunder clap", ACTION_HIGH), From c253a32039ea66e2af246c3f7fb32c005d94f773 Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 16:09:32 +1100 Subject: [PATCH 06/15] Update GenericWarriorStrategy.cpp --- src/strategy/warrior/GenericWarriorStrategy.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/strategy/warrior/GenericWarriorStrategy.cpp index a1132641..a3046b04 100644 --- a/src/strategy/warrior/GenericWarriorStrategy.cpp +++ b/src/strategy/warrior/GenericWarriorStrategy.cpp @@ -48,10 +48,10 @@ void WarrirorAoeStrategy::InitTriggers(std::vector& triggers) // clap on snare target", ACTION_HIGH + 3), nullptr))); triggers.push_back(new TriggerNode("thunder clap", // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 10), nullptr))); triggers.push_back(new TriggerNode( - "light aoe", NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 5), - new NextAction("shockwave", ACTION_HIGH + 4), - new NextAction("sweeping strikes", ACTION_HIGH + 7), + "light aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), new NextAction("bladestorm", ACTION_HIGH + 6), + new NextAction("thunder clap", ACTION_HIGH + 5), + new NextAction("shockwave", ACTION_HIGH + 4), // new NextAction("whirlwind", ACTION_HIGH + 2), new NextAction("demoralizing shout without life time check", ACTION_HIGH + 1), new NextAction("cleave", ACTION_HIGH), nullptr))); From a6ceaa5565538e0b6bc253e1fbf49ca242e8279e Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 16:28:48 +1100 Subject: [PATCH 07/15] Update ArmsWarriorStrategy.cpp --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index 732e025d..d0c6a183 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -68,9 +68,9 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) new NextAction("slam", ACTION_HIGH + 1), nullptr))); // triggers.push_back(new TriggerNode("medium rage available", - // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), - // new NextAction("thunder clap", ACTION_HIGH), - // nullptr))); + // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), + // new NextAction("thunder clap", ACTION_HIGH), + // nullptr))); triggers.push_back( new TriggerNode("bloodrage", NextAction::array(0, new NextAction("bloodrage", ACTION_HIGH + 2), nullptr))); triggers.push_back( From b9c96e80c3d787b73e9a9a3ea808a523fc9de7ca Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 16:52:54 +1100 Subject: [PATCH 08/15] Added medium aoe trigger for SS/BS combo --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index d0c6a183..96106f72 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -63,10 +63,10 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); triggers.push_back(new TriggerNode( "victory rush", NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); - triggers.push_back(new TriggerNode("high rage available", - NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), - new NextAction("slam", ACTION_HIGH + 1), - nullptr))); + triggers.push_back(new TriggerNode("high rage available", + NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), + new NextAction("slam", ACTION_HIGH + 1), + nullptr))); // triggers.push_back(new TriggerNode("medium rage available", // NextAction::array(0, new NextAction("slam", ACTION_HIGH + 1), // new NextAction("thunder clap", ACTION_HIGH), @@ -82,4 +82,8 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) "critical health", NextAction::array(0, new NextAction("intimidating shout", ACTION_EMERGENCY), nullptr))); // triggers.push_back(new TriggerNode("medium aoe", // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), nullptr))); + triggers.push_back(new TriggerNode("medium aoe", + NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), + new NextAction("bladestorm", ACTION_HIGH + 6), + nullptr))); } From 9432b265ea04e9401cd103c1081d34424b730a2b Mon Sep 17 00:00:00 2001 From: avirar Date: Sun, 29 Dec 2024 17:14:38 +1100 Subject: [PATCH 09/15] Update GenericWarriorStrategy.cpp --- src/strategy/warrior/GenericWarriorStrategy.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/strategy/warrior/GenericWarriorStrategy.cpp index a3046b04..97e53112 100644 --- a/src/strategy/warrior/GenericWarriorStrategy.cpp +++ b/src/strategy/warrior/GenericWarriorStrategy.cpp @@ -47,6 +47,10 @@ void WarrirorAoeStrategy::InitTriggers(std::vector& triggers) // triggers.push_back(new TriggerNode("thunder clap on snare target", NextAction::array(0, new NextAction("thunder // clap on snare target", ACTION_HIGH + 3), nullptr))); triggers.push_back(new TriggerNode("thunder clap", // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 10), nullptr))); + triggers.push_back(new TriggerNode( + "medium aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), + new NextAction("bladestorm", ACTION_HIGH + 6), + nullptr))); triggers.push_back(new TriggerNode( "light aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), new NextAction("bladestorm", ACTION_HIGH + 6), @@ -60,4 +64,5 @@ void WarrirorAoeStrategy::InitTriggers(std::vector& triggers) NextAction::array(0, new NextAction("shockwave on snare target", ACTION_HIGH + 5), nullptr))); // triggers.push_back(new TriggerNode("high rage available", NextAction::array(0, new NextAction("whirlwind", // ACTION_HIGH + 10), nullptr))); + } From c7dd947a7a20d94ea07a0e61b92f47f0de5c8d78 Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 09:34:43 +1100 Subject: [PATCH 10/15] Update GenericWarriorStrategy.cpp --- src/strategy/warrior/GenericWarriorStrategy.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/strategy/warrior/GenericWarriorStrategy.cpp index 97e53112..c48a6493 100644 --- a/src/strategy/warrior/GenericWarriorStrategy.cpp +++ b/src/strategy/warrior/GenericWarriorStrategy.cpp @@ -47,10 +47,11 @@ void WarrirorAoeStrategy::InitTriggers(std::vector& triggers) // triggers.push_back(new TriggerNode("thunder clap on snare target", NextAction::array(0, new NextAction("thunder // clap on snare target", ACTION_HIGH + 3), nullptr))); triggers.push_back(new TriggerNode("thunder clap", // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 10), nullptr))); - triggers.push_back(new TriggerNode( + /* triggers.push_back(new TriggerNode( "medium aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), new NextAction("bladestorm", ACTION_HIGH + 6), nullptr))); + */ triggers.push_back(new TriggerNode( "light aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), new NextAction("bladestorm", ACTION_HIGH + 6), From 6842505c88c352d720b76b2995546a63cc8caa43 Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 09:51:47 +1100 Subject: [PATCH 11/15] Update ArmsWarriorStrategy.cpp --- src/strategy/warrior/ArmsWarriorStrategy.cpp | 56 +++++++++++++------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp index 96106f72..b6c5eed7 100644 --- a/src/strategy/warrior/ArmsWarriorStrategy.cpp +++ b/src/strategy/warrior/ArmsWarriorStrategy.cpp @@ -44,25 +44,41 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) GenericWarriorStrategy::InitTriggers(triggers); triggers.push_back(new TriggerNode("enemy out of melee", - NextAction::array(0, new NextAction("charge", ACTION_MOVE + 10), nullptr))); - triggers.push_back(new TriggerNode( - "battle stance", NextAction::array(0, new NextAction("battle stance", ACTION_HIGH + 10), nullptr))); + NextAction::array(0, new NextAction("charge", ACTION_MOVE + 10), nullptr))); + + triggers.push_back(new TriggerNode("battle stance", + NextAction::array(0, new NextAction("battle stance", ACTION_HIGH + 10), nullptr))); + triggers.push_back(new TriggerNode("battle shout", - NextAction::array(0, new NextAction("battle shout", ACTION_HIGH + 9), nullptr))); - triggers.push_back(new TriggerNode( - "mortal strike", NextAction::array(0, new NextAction("mortal strike", ACTION_HIGH + 3), nullptr))); + NextAction::array(0, new NextAction("battle shout", ACTION_HIGH + 9), nullptr))); + + triggers.push_back(new TriggerNode("rend", + NextAction::array(0, new NextAction("rend", ACTION_HIGH + 8), nullptr))); + + triggers.push_back(new TriggerNode("rend on attacker", + NextAction::array(0, new NextAction("rend on attacker", ACTION_HIGH + 8), nullptr))); + + triggers.push_back(new TriggerNode("mortal strike", + NextAction::array(0, new NextAction("mortal strike", ACTION_HIGH + 3), nullptr))); + triggers.push_back(new TriggerNode("target critical health", - NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); - triggers.push_back( - new TriggerNode("sudden death", NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); - triggers.push_back( - new TriggerNode("hamstring", NextAction::array(0, new NextAction("piercing howl", ACTION_HIGH), nullptr))); - triggers.push_back( - new TriggerNode("overpower", NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); + NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); + + triggers.push_back(new TriggerNode("sudden death", + NextAction::array(0, new NextAction("execute", ACTION_HIGH + 5), nullptr))); + + triggers.push_back(new TriggerNode("hamstring", + NextAction::array(0, new NextAction("piercing howl", ACTION_HIGH), nullptr))); + + triggers.push_back(new TriggerNode("overpower", + NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); + triggers.push_back(new TriggerNode("taste for blood", - NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); - triggers.push_back(new TriggerNode( - "victory rush", NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); + NextAction::array(0, new NextAction("overpower", ACTION_HIGH + 4), nullptr))); + + triggers.push_back(new TriggerNode("victory rush", + NextAction::array(0, new NextAction("victory rush", ACTION_INTERRUPT), nullptr))); + triggers.push_back(new TriggerNode("high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), new NextAction("slam", ACTION_HIGH + 1), @@ -73,17 +89,19 @@ void ArmsWarriorStrategy::InitTriggers(std::vector& triggers) // nullptr))); triggers.push_back( new TriggerNode("bloodrage", NextAction::array(0, new NextAction("bloodrage", ACTION_HIGH + 2), nullptr))); + triggers.push_back( new TriggerNode("death wish", NextAction::array(0, new NextAction("death wish", ACTION_HIGH + 2), nullptr))); - triggers.push_back(new TriggerNode("rend", NextAction::array(0, new NextAction("rend", ACTION_HIGH + 8), nullptr))); - triggers.push_back(new TriggerNode( - "rend on attacker", NextAction::array(0, new NextAction("rend on attacker", ACTION_HIGH + 8), nullptr))); + triggers.push_back(new TriggerNode( "critical health", NextAction::array(0, new NextAction("intimidating shout", ACTION_EMERGENCY), nullptr))); + // triggers.push_back(new TriggerNode("medium aoe", // NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 2), nullptr))); + /* triggers.push_back(new TriggerNode("medium aoe", NextAction::array(0, new NextAction("sweeping strikes", ACTION_HIGH + 7), new NextAction("bladestorm", ACTION_HIGH + 6), nullptr))); + */ } From 64b5cb833a45fc61bf5cdd52a9264a24a52ead8b Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 10:32:49 +1100 Subject: [PATCH 12/15] Merged Fury tweaks into Arms branch --- src/strategy/warrior/FuryWarriorStrategy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/strategy/warrior/FuryWarriorStrategy.cpp b/src/strategy/warrior/FuryWarriorStrategy.cpp index 56e12b7b..49410f2c 100644 --- a/src/strategy/warrior/FuryWarriorStrategy.cpp +++ b/src/strategy/warrior/FuryWarriorStrategy.cpp @@ -68,12 +68,14 @@ void FuryWarriorStrategy::InitTriggers(std::vector& triggers) // snare target", ACTION_HIGH), nullptr))); triggers.push_back( new TriggerNode("bloodthirst", NextAction::array(0, new NextAction("bloodthirst", ACTION_HIGH + 7), nullptr))); + triggers.push_back( + new TriggerNode("whirlwind", NextAction::array(0, new NextAction("whirlwind", ACTION_HIGH + 6), nullptr))); triggers.push_back( new TriggerNode("instant slam", NextAction::array(0, new NextAction("slam", ACTION_HIGH + 5), nullptr))); triggers.push_back( new TriggerNode("bloodrage", NextAction::array(0, new NextAction("bloodrage", ACTION_HIGH + 2), nullptr))); triggers.push_back(new TriggerNode("medium rage available", - NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH + 1), NULL))); + NextAction::array(0, new NextAction("heroic strike", ACTION_DEFAULT + 0.1f), NULL))); // triggers.push_back(new TriggerNode("berserker rage", NextAction::array(0, new NextAction("berserker rage", // ACTION_HIGH + 2), nullptr))); triggers.push_back(new TriggerNode("light aoe", NextAction::array(0, // new NextAction("whirlwind", ACTION_HIGH + 2), From a8baa213d6761a040bbcfdd36a8b52f8c4d0ddf1 Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 10:34:01 +1100 Subject: [PATCH 13/15] Merged Fury tweaks into Arms branch to unify PR --- src/strategy/warrior/WarriorAiObjectContext.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/strategy/warrior/WarriorAiObjectContext.cpp b/src/strategy/warrior/WarriorAiObjectContext.cpp index 71be13bf..efe4c9c1 100644 --- a/src/strategy/warrior/WarriorAiObjectContext.cpp +++ b/src/strategy/warrior/WarriorAiObjectContext.cpp @@ -78,6 +78,7 @@ public: creators["thunder clap on snare target"] = &WarriorTriggerFactoryInternal::thunder_clap_on_snare_target; creators["thunder clap"] = &WarriorTriggerFactoryInternal::thunder_clap; creators["bloodthirst"] = &WarriorTriggerFactoryInternal::bloodthirst; + creators["whirlwind"] = &WarriorTriggerFactoryInternal::whirlwind; creators["berserker rage"] = &WarriorTriggerFactoryInternal::berserker_rage; creators["pummel on enemy healer"] = &WarriorTriggerFactoryInternal::pummel_on_enemy_healer; creators["pummel"] = &WarriorTriggerFactoryInternal::pummel; @@ -157,6 +158,7 @@ private: } static Trigger* berserker_rage(PlayerbotAI* botAI) { return new BerserkerRageBuffTrigger(botAI); } static Trigger* bloodthirst(PlayerbotAI* botAI) { return new BloodthirstBuffTrigger(botAI); } + static Trigger* whirlwind(PlayerbotAI* botAI) { return new WhirlwindTrigger(botAI); } static Trigger* thunder_clap_on_snare_target(PlayerbotAI* botAI) { return new ThunderClapSnareTrigger(botAI); } static Trigger* thunder_clap(PlayerbotAI* botAI) { return new ThunderClapTrigger(botAI); } static Trigger* mortal_strike(PlayerbotAI* botAI) { return new MortalStrikeDebuffTrigger(botAI); } From f1a1562ae9640d898753770789177e103fbf77ea Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 10:36:55 +1100 Subject: [PATCH 14/15] Merged Fury tweaks into Arms branch for unified PR --- src/strategy/warrior/WarriorTriggers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/strategy/warrior/WarriorTriggers.h b/src/strategy/warrior/WarriorTriggers.h index 223e0049..4ce070b9 100644 --- a/src/strategy/warrior/WarriorTriggers.h +++ b/src/strategy/warrior/WarriorTriggers.h @@ -45,6 +45,7 @@ DEBUFF_TRIGGER(ShockwaveTrigger, "shockwave"); BOOST_TRIGGER(DeathWishTrigger, "death wish"); BOOST_TRIGGER(RecklessnessTrigger, "recklessness"); BUFF_TRIGGER(BloodthirstBuffTrigger, "bloodthirst"); +BUFF_TRIGGER(WhirlwindTrigger, "whirlwind"); BUFF_TRIGGER(BerserkerRageBuffTrigger, "berserker rage"); INTERRUPT_HEALER_TRIGGER(ShieldBashInterruptEnemyHealerSpellTrigger, "shield bash"); INTERRUPT_TRIGGER(ShieldBashInterruptSpellTrigger, "shield bash"); From fd7b82d170eda747aba03ea4ead7891e386f4a66 Mon Sep 17 00:00:00 2001 From: avirar Date: Mon, 30 Dec 2024 13:58:34 +1100 Subject: [PATCH 15/15] Lowered Heroic Strike for Prot spec too Also added Devastate as a medium rage ability after Shield Slam. --- src/strategy/warrior/TankWarriorStrategy.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/strategy/warrior/TankWarriorStrategy.cpp b/src/strategy/warrior/TankWarriorStrategy.cpp index 5f228b09..c1e8aa18 100644 --- a/src/strategy/warrior/TankWarriorStrategy.cpp +++ b/src/strategy/warrior/TankWarriorStrategy.cpp @@ -89,7 +89,9 @@ void TankWarriorStrategy::InitTriggers(std::vector& triggers) triggers.push_back( new TriggerNode("sunder armor", NextAction::array(0, new NextAction("devastate", ACTION_HIGH + 2), nullptr))); triggers.push_back(new TriggerNode("medium rage available", - NextAction::array(0, new NextAction("shield slam", ACTION_HIGH + 1), nullptr))); + NextAction::array(0, new NextAction("shield slam", ACTION_HIGH + 2), + new NextAction("devastate", ACTION_HIGH + 1), + nullptr))); triggers.push_back(new TriggerNode( "shield block", NextAction::array(0, new NextAction("shield block", ACTION_INTERRUPT + 1), nullptr))); triggers.push_back( @@ -129,7 +131,7 @@ void TankWarriorStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode("protect party member", NextAction::array(0, new NextAction("intervene", ACTION_EMERGENCY), nullptr))); triggers.push_back(new TriggerNode( - "high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH + 1), nullptr))); + "high rage available", NextAction::array(0, new NextAction("heroic strike", ACTION_HIGH), nullptr))); triggers.push_back(new TriggerNode("medium rage available", NextAction::array(0, new NextAction("thunder clap", ACTION_HIGH + 1), nullptr))); }