Fix hunter autoshot getting stuck after fleeing

celguar · Sep 8, 2023 · 3addef9 · 3addef9
1 parent e5c8079
commit 3addef9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/playerbot/strategy/hunter/GenericHunterStrategy.cpp b/playerbot/strategy/hunter/GenericHunterStrategy.cpp
@@ -100,12 +100,6 @@ void GenericHunterStrategy::InitCombatTriggers(std::list<TriggerNode*> &triggers
         "often",
         NextAction::array(0, new NextAction("immolation trap on target", ACTION_INTERRUPT + 1), NULL)));
 
-    // MOVE THIS TO PVP
-    // Traps must be on ACTION_INTERRUPT or higher due to its movements and chained actions
-    triggers.push_back(new TriggerNode(
-        "enemy is close",
-        NextAction::array(0, new NextAction("freezing trap in place", ACTION_INTERRUPT), NULL)));
-
     triggers.push_back(new TriggerNode(
         "high threat",
         NextAction::array(0, new NextAction("feign death", ACTION_EMERGENCY + 1), 
@@ -164,4 +158,9 @@ void HunterCcStrategy::InitCombatTriggers(std::list<TriggerNode*> &triggers)
     triggers.push_back(new TriggerNode(
         "frost trap",
         NextAction::array(0, new NextAction("frost trap on target", ACTION_INTERRUPT + 2), NULL)));
+
+    // MOVE THIS TO PVP
+    triggers.push_back(new TriggerNode(
+        "enemy is close",
+        NextAction::array(0, new NextAction("freezing trap in place", ACTION_INTERRUPT), NULL)));
 }
diff --git a/playerbot/strategy/hunter/HunterActions.cpp b/playerbot/strategy/hunter/HunterActions.cpp
@@ -35,4 +35,14 @@ bool CastAutoShotAction::isUseful()
         return false;
 
     return ai->HasStrategy("ranged", BotState::BOT_STATE_COMBAT) && AI_VALUE(uint32, "active spell") != AI_VALUE2(uint32, "spell id", getName());
-}
+}
+
+bool CastAutoShotAction::Execute(Event& event)
+{
+    if (!bot->IsStopped())
+    {
+        ai->StopMoving();
+    }
+
+    return CastSpellAction::Execute(event);
+}
diff --git a/playerbot/strategy/hunter/HunterActions.h b/playerbot/strategy/hunter/HunterActions.h
@@ -11,7 +11,8 @@ namespace ai
     {
     public:
         CastAutoShotAction(PlayerbotAI* ai) : CastSpellAction(ai, "auto shot") {}
-        virtual bool isUseful();
+        bool Execute(Event& event) override;
+        bool isUseful() override;
     };
 
     BEGIN_RANGED_SPELL_ACTION(CastTranquilizingShotAction, "tranquilizing shot")