AI: Enforce evade of critters on flee end

cmangos · Apr 24, 2022 · a0fc3c3 · a0fc3c3
1 parent 5f8ff7b
commit a0fc3c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/game/AI/BaseAI/CreatureAI.cpp b/src/game/AI/BaseAI/CreatureAI.cpp
@@ -54,7 +54,10 @@ void CreatureAI::EnterCombat(Unit* enemy)
     UnitAI::EnterCombat(enemy);
     // TODO: Monitor this condition to see if it conflicts with any pets
     if (m_creature->IsCritter() && !m_creature->IsPet() && !m_creature->IsInPanic() && enemy && enemy->IsPlayerControlled())
+    {
         DoFlee(30000);
+        SetAIOrder(ORDER_CRITTER_FLEE); // mark as critter flee for custom handling
+    }
     if (enemy && (m_creature->IsGuard() || m_creature->IsCivilian()))
     {
         // Send Zone Under Attack message to the LocalDefense and WorldDefense Channels
@@ -252,4 +255,10 @@ void CreatureAI::TimedFleeingEnded()
             if (factionTemplate->factionFlags & FACTION_TEMPLATE_FLEE_FROM_CALL_FOR_HELP)
                 EnterEvadeMode();
     }
+    if (GetAIOrder() == ORDER_CRITTER_FLEE && m_creature->IsAlive())
+    {
+        SetCombatScriptStatus(false);
+        EnterEvadeMode();
+    }
+    SetAIOrder(ORDER_NONE);
 }
diff --git a/src/game/AI/BaseAI/UnitAI.h b/src/game/AI/BaseAI/UnitAI.h
@@ -93,6 +93,7 @@ enum AIOrders
     ORDER_RETREATING,
     ORDER_EVADE,
     ORDER_FLEE_FROM_CALL_FOR_HELP,
+    ORDER_CRITTER_FLEE,
     ORDER_CUSTOM,
 };