From 0c6f6562361bacd2a627e1924ec4c54b5dea40f7 Mon Sep 17 00:00:00 2001
From: Type1Error <125221903+Type1Error@users.noreply.github.com>
Date: Wed, 7 May 2025 19:54:41 +0000
Subject: [PATCH] fix(strategy): Revert InitTriggers to previous implementation
 (#1272)

Fixes #1169

Reverts TankAssistStrategy and DpsAssistStrategy InitTriggers implementations to their previous versions.
The changes from commit 24efa7e appeared to be optimizations without fixing any documented bugs, but were causing issues.
---
 src/strategy/generic/DpsAssistStrategy.cpp  |  7 +++----
 src/strategy/generic/DpsAssistStrategy.h    |  2 +-
 src/strategy/generic/TankAssistStrategy.cpp | 13 +++----------
 src/strategy/generic/TankAssistStrategy.h   |  3 +--
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/strategy/generic/DpsAssistStrategy.cpp b/src/strategy/generic/DpsAssistStrategy.cpp
index 6c1b2475..11047e26 100644
--- a/src/strategy/generic/DpsAssistStrategy.cpp
+++ b/src/strategy/generic/DpsAssistStrategy.cpp
@@ -7,11 +7,10 @@
 
 #include "Playerbots.h"
 
-NextAction** DpsAssistStrategy::getDefaultActions()
+void DpsAssistStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    return NextAction::array(
-        0, new NextAction("dps assist", 50.0f),
-        nullptr);
+    triggers.push_back(
+        new TriggerNode("not dps target active", NextAction::array(0, new NextAction("dps assist", 50.0f), nullptr)));
 }
 
 void DpsAoeStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
diff --git a/src/strategy/generic/DpsAssistStrategy.h b/src/strategy/generic/DpsAssistStrategy.h
index 44c5b409..394a28ef 100644
--- a/src/strategy/generic/DpsAssistStrategy.h
+++ b/src/strategy/generic/DpsAssistStrategy.h
@@ -16,7 +16,7 @@ public:
     DpsAssistStrategy(PlayerbotAI* botAI) : NonCombatStrategy(botAI) {}
 
     std::string const getName() override { return "dps assist"; }
-    NextAction** getDefaultActions() override;
+    void InitTriggers(std::vector<TriggerNode*>& triggers) override;
 };
 
 class DpsAoeStrategy : public NonCombatStrategy
diff --git a/src/strategy/generic/TankAssistStrategy.cpp b/src/strategy/generic/TankAssistStrategy.cpp
index bf385bfc..46ad4d96 100644
--- a/src/strategy/generic/TankAssistStrategy.cpp
+++ b/src/strategy/generic/TankAssistStrategy.cpp
@@ -7,15 +7,8 @@
 
 #include "Playerbots.h"
 
-NextAction** TankAssistStrategy::getDefaultActions()
+void TankAssistStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    return NextAction::array(
-        0, new NextAction("tank assist", 50.0f),
-        nullptr);
+    triggers.push_back(
+        new TriggerNode("tank assist", NextAction::array(0, new NextAction("tank assist", 50.0f), nullptr)));
 }
-
-// void TankAssistStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
-// {
-//     triggers.push_back(
-//         new TriggerNode("tank assist", NextAction::array(0, new NextAction("tank assist", 50.0f), nullptr)));
-// }
diff --git a/src/strategy/generic/TankAssistStrategy.h b/src/strategy/generic/TankAssistStrategy.h
index c4cb7c09..924773ad 100644
--- a/src/strategy/generic/TankAssistStrategy.h
+++ b/src/strategy/generic/TankAssistStrategy.h
@@ -17,8 +17,7 @@ public:
 
     std::string const getName() override { return "tank assist"; }
     uint32 GetType() const override { return STRATEGY_TYPE_TANK; }
-    NextAction** getDefaultActions() override;
-    // void InitTriggers(std::vector<TriggerNode*>& triggers) override;
+    void InitTriggers(std::vector<TriggerNode*>& triggers) override;
 };
 
 #endif