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

6 files changed, 27 insertions, 9 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
index 1cdf56fb5f0..1265e378de1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
@@ -124,6 +124,8 @@ enum GrimstoneTexts
     SAY_TEXT6          = 5
 };
 
+static constexpr uint32 PATH_ESCORT_GRIMSTONE = 80770;
+
 /// @todo implement quest part of event (different end boss)
 class npc_grimstone : public CreatureScript
 {
@@ -287,7 +289,8 @@ public:
                     case 0:
                         Talk(SAY_TEXT5);
                         HandleGameObject(DATA_ARENA4, false);
-                        Start(false, false);
+                        LoadPath(PATH_ESCORT_GRIMSTONE);
+                        Start(false);
                         CanWalk = true;
                         Event_Timer = 0;
                         break;
@@ -502,7 +505,8 @@ enum Rocknot
 {
     SAY_GOT_BEER       = 0,
     QUEST_ALE          = 4295,
-    SPELL_DRUNKEN_RAGE = 14872
+    SPELL_DRUNKEN_RAGE = 14872,
+    PATH_ESCORT_ROCKNOT = 76026
 };
 
 class npc_rocknot : public CreatureScript
@@ -618,7 +622,8 @@ public:
                     Talk(SAY_GOT_BEER);
                     DoCastSelf(SPELL_DRUNKEN_RAGE, false);
 
-                    Start(false, false);
+                    LoadPath(PATH_ESCORT_ROCKNOT);
+                    Start(false);
                 }
             }
         }
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index 5cd924863a5..3b501ca29d1 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -56,7 +56,9 @@ enum BlastmasterEmi
     SAY_BLASTMASTER_18  = 18,
     SAY_BLASTMASTER_19  = 19,
 
-    SAY_GRUBBIS         = 0
+    SAY_GRUBBIS         = 0,
+
+    PATH_ESCORT_BLASTMASTER_EMI = 63986,
 };
 
 const Position SpawnPosition[] =
@@ -133,7 +135,8 @@ public:
         {
             if (gossipListId == 0)
             {
-                Start(true, false, player->GetGUID());
+                LoadPath(PATH_ESCORT_BLASTMASTER_EMI);
+                Start(true, player->GetGUID());
 
                 me->SetFaction(player->GetFaction());
                 SetData(1, 0);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index fb33ea12fdd..528a66bad72 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -122,6 +122,8 @@ float Spawns[6][2]=
 #define SPAWN_Y             -1758
 #define SPAWN_O             4.738f
 
+static constexpr uint32 PATH_ESCORT_BARNES = 134498;
+
 class npc_barnes : public CreatureScript
 {
 public:
@@ -175,7 +177,8 @@ public:
             if (m_uiEventId == EVENT_OZ)
                 instance->SetData(DATA_OPERA_OZ_DEATHCOUNT, IN_PROGRESS);
 
-            Start(false, false);
+            LoadPath(PATH_ESCORT_BARNES);
+            Start(false);
         }
 
         void JustEngagedWith(Unit* /*who*/) override { }
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 04fe6ee6ebb..f1a72d1818b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -258,6 +258,8 @@ Position const LightofDawnLoc[] =
     {2273.972f, -5257.676f, 78.862f, 0},     // 29 Lich king moves forward
 };
 
+static constexpr uint32 PATH_ESCORT_MOGRAINE = 233386;
+
 class npc_highlord_darion_mograine : public CreatureScript
 {
 public:
@@ -1608,7 +1610,8 @@ public:
                 case GOSSIP_ACTION_INFO_DEF + 1:
                     CloseGossipMenuFor(player);
                     uiStep = 1;
-                    Start(true, true, player->GetGUID());
+                    LoadPath(PATH_ESCORT_MOGRAINE);
+                    Start(true, player->GetGUID());
                     break;
             }
             return true;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 81219de4fe0..72551834c46 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -125,6 +125,8 @@ private:
     bool _enrage;
 };
 
+static constexpr uint32 PATH_ESCORT_SCARLET_TRAINEE = 52602;
+
 struct npc_scarlet_trainee : public EscortAI
 {
     npc_scarlet_trainee(Creature* creature) : EscortAI(creature)
@@ -138,7 +140,8 @@ struct npc_scarlet_trainee : public EscortAI
         {
             if (_startTimer <= diff)
             {
-                Start(true, true);
+                LoadPath(PATH_ESCORT_SCARLET_TRAINEE);
+                Start(true);
                 _startTimer = 0;
             }
             else
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 992163dfa3a..9ea91aa40e0 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -123,7 +123,8 @@ public:
             if (action == GOSSIP_ACTION_INFO_DEF + 1)
             {
                 CloseGossipMenuFor(player);
-                Start(false, false, player->GetGUID());
+                LoadPath((me->GetEntry() << 3) | 2);
+                Start(false, player->GetGUID());
             }
             return true;
         }