Core/AI: Drop script_waypoints and move data to waypoint_data (#28879)

3 files changed, 18 insertions, 10 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 1d246096c7b..813d5ce4e46 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -51,6 +51,8 @@ enum Events
     EVENT_BERSERK
 };
 
+static constexpr uint32 PATH_ESCORT_HELLMAW = 149850;
+
 struct boss_ambassador_hellmaw : public EscortAI
 {
     boss_ambassador_hellmaw(Creature* creature) : EscortAI(creature)
@@ -105,7 +107,8 @@ struct boss_ambassador_hellmaw : public EscortAI
             me->RemoveAurasDueToSpell(SPELL_BANISH);
 
         Talk(SAY_INTRO);
-        Start(true, false, ObjectGuid::Empty, nullptr, false, true);
+        LoadPath(PATH_ESCORT_HELLMAW);
+        Start(true, ObjectGuid::Empty, nullptr, false, true);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index ac2d55346bc..a4395a2fb04 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -60,7 +60,9 @@ enum MagharCaptive
     NPC_MURK_RAIDER             = 18203,
     NPC_MURK_BRUTE              = 18211,
     NPC_MURK_SCAVENGER          = 18207,
-    NPC_MURK_PUTRIFIER          = 18202
+    NPC_MURK_PUTRIFIER          = 18202,
+
+    PATH_ESCORT_MAGHAR_CAPTIVE  = 145682,
 };
 
 static float m_afAmbushA[]= {-1568.805786f, 8533.873047f, 1.958f};
@@ -130,8 +132,6 @@ public:
 
                     if (Player* player = GetPlayerForEscort())
                         player->GroupEventHappens(QUEST_TOTEM_KARDASH_H, me);
-
-                    SetRun();
                     break;
             }
         }
@@ -207,7 +207,8 @@ public:
             {
                 me->SetStandState(UNIT_STAND_STATE_STAND);
                 me->SetFaction(FACTION_ESCORTEE_H_NEUTRAL_ACTIVE);
-                Start(true, false, player->GetGUID(), quest);
+                LoadPath(PATH_ESCORT_MAGHAR_CAPTIVE);
+                Start(true, player->GetGUID(), quest);
                 Talk(SAY_MAG_START);
 
                 me->SummonCreature(NPC_MURK_RAIDER, m_afAmbushA[0] + 2.5f, m_afAmbushA[1] - 2.5f, m_afAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s);
@@ -249,6 +250,8 @@ enum KurenaiCaptive
     NPC_KUR_MURK_BRUTE              = 18211,
     NPC_KUR_MURK_SCAVENGER          = 18207,
     NPC_KUR_MURK_PUTRIFIER          = 18202,
+
+    PATH_ESCORT_KURENAI_CAPTIVE     = 145674,
 };
 
 static float kurenaiAmbushA[]= {-1568.805786f, 8533.873047f, 1.958f};
@@ -321,8 +324,6 @@ public:
 
                     if (Player* player = GetPlayerForEscort())
                         player->GroupEventHappens(QUEST_TOTEM_KARDASH_A, me);
-
-                    SetRun();
                     break;
                 }
             }
@@ -401,7 +402,8 @@ public:
             {
                 me->SetStandState(UNIT_STAND_STATE_STAND);
                 me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_ACTIVE);
-                Start(true, false, player->GetGUID(), quest);
+                LoadPath(PATH_ESCORT_KURENAI_CAPTIVE);
+                Start(true, player->GetGUID(), quest);
                 Talk(SAY_KUR_START);
 
                 me->SummonCreature(NPC_KUR_MURK_RAIDER, kurenaiAmbushA[0] + 2.5f, kurenaiAmbushA[1] - 2.5f, kurenaiAmbushA[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s);
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index a5dd73a2f37..b0b841d576b 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -490,7 +490,9 @@ enum Earthmender
     SPELL_HEALING_WAVE          = 12491,
 
     QUEST_ESCAPE_COILSCAR       = 10451,
-    NPC_COILSKAR_ASSASSIN       = 21044
+    NPC_COILSKAR_ASSASSIN       = 21044,
+
+    PATH_ESCORT_WILDA           = 168218,
 };
 
 class npc_earthmender_wilda : public CreatureScript
@@ -635,7 +637,8 @@ public:
                 Talk(SAY_WIL_START, player);
                 me->SetFaction(FACTION_EARTHEN_RING);
 
-                Start(false, false, player->GetGUID(), quest);
+                LoadPath(PATH_ESCORT_WILDA);
+                Start(false, player->GetGUID(), quest);
             }
         }
     };