Scripts: Adjust previous commit to include scripts found only in 3.3.5 branch and exclude master branch data

Thelsen · Shauren · commit 246683419340 · 2025-12-23T16:30:31.000+01:00
diff --git a/sql/updates/world/3.3.5/2025_12_23_00_world_2023_04_10_00_world_script_waypoints.sql b/sql/updates/world/3.3.5/2025_12_23_00_world_2023_04_10_00_world_script_waypoints.sql
@@ -94,12 +94,6 @@ SET @PATHID := 138498;
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID;
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 28;
 
--- Wizzlecrank Shredder, zone_the_barrens.cpp
-SET @PATHID := 27514;
-UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID;
-UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` BETWEEN 9 AND 17;
-UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 18;
-
 -- Brann Bronzebeard, halls_of_stone.cpp
 SET @PATHID := 224562;
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 1;
@@ -108,6 +102,10 @@ UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `po
 SET @PATHID := 145682;
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 16;
 
+-- Rin'ji, zone_hinterlands.cpp
+SET @PATHID := 62242;
+UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 17;
+
 -- ------------------------------------------------------------------------------------------------
 
 -- Mograine, chapter5.cpp
@@ -143,8 +141,5 @@ UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=266962;
 -- Icefang, zone_storm_peaks.cpp
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=236818;
 
--- Garments of quests, npcs_special.cpp
-UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id` IN(99386,99418,99426,99434,99442);
-
 -- Taretha, old_hillsbrad.cpp
 UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=151098;
diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
@@ -62,6 +62,8 @@ Position const AmbushMoveTo[] =
     { 70.886589f,  -2874.335449f, 116.675f, 0.0f }
 };
 
+static constexpr uint32 PATH_ESCORT_RINJI = 62242;
+
 class npc_rinji : public CreatureScript
 {
 public:
@@ -140,7 +142,8 @@ class npc_rinji : public CreatureScript
                 if (GameObject* go = me->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE))
                     go->UseDoorOrButton();
 
-                EscortAI::Start(false, false, player->GetGUID(), quest);
+                LoadPath(PATH_ESCORT_RINJI);
+                Start(false, player->GetGUID(), quest);
             }
         }
 
@@ -164,7 +167,6 @@ class npc_rinji : public CreatureScript
                 case 17:
                     Talk(SAY_RIN_COMPLETE, player);
                     player->GroupEventHappens(QUEST_RINJI_TRAPPED, me);
-                    SetRun();
                     postEventCount = 1;
                     break;
             }
diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
@@ -319,6 +319,8 @@ enum TyrionSpybot
     NPC_LORD_GREGOR_LESCOVAR = 1754,
 };
 
+static constexpr uint32 PATH_ESCORT_LESCOVAR = 70850;
+
 class npc_tyrion_spybot : public CreatureScript
 {
 public:
@@ -438,8 +440,12 @@ class npc_tyrion_spybot : public CreatureScript
                             {
                                 if (Player* player = GetPlayerForEscort())
                                 {
-                                    ENSURE_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, player->GetGUID());
-                                    ENSURE_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f);
+                                    if (EscortAI* ai = CAST_AI(EscortAI, pLescovar->AI()))
+                                    {
+                                        ai->LoadPath(PATH_ESCORT_LESCOVAR);
+                                        ai->Start(false, player->GetGUID());
+                                        ai->SetMaxPlayerDistance(200.0f);
+                                    }
                                 }
                             }
                             me->DisappearAndDie();
@@ -468,6 +474,8 @@ enum Tyrion
     NPC_TYRION_SPYBOT = 8856
 };
 
+static constexpr uint32 PATH_ESCORT_TYRION_SPYBOT = 14034;
+
 class npc_tyrion : public CreatureScript
 {
 public:
@@ -483,8 +491,12 @@ class npc_tyrion : public CreatureScript
             {
                 if (Creature* spybot = me->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true))
                 {
-                    ENSURE_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, spybot->AI())->Start(false, false, player->GetGUID());
-                    ENSURE_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, spybot->AI())->SetMaxPlayerDistance(200.0f);
+                    if (EscortAI* ai = CAST_AI(EscortAI, spybot->AI()))
+                    {
+                        ai->LoadPath(PATH_ESCORT_TYRION_SPYBOT);
+                        ai->Start(false, player->GetGUID());
+                        ai->SetMaxPlayerDistance(200.0f);
+                    }
                 }
             }
         }
diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp
@@ -196,6 +196,8 @@ enum Remtravel
     NPC_GRAVEL_GEO              = 2160
 };
 
+static constexpr uint32 PATH_ESCORT_PROSPECTOR_REMTRAVEL = 23338;
+
 class npc_prospector_remtravel : public CreatureScript
 {
 public:
@@ -284,7 +286,8 @@ class npc_prospector_remtravel : public CreatureScript
         {
             if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
             {
-                Start(false, false, player->GetGUID());
+                LoadPath(PATH_ESCORT_PROSPECTOR_REMTRAVEL);
+                Start(false, player->GetGUID());
                 me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);
             }
         }
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -196,7 +196,7 @@ class npc_clintar_spirit : public CreatureScript
                     AddWaypoint(i, Clintar_spirit_WP[i].X, Clintar_spirit_WP[i].Y, Clintar_spirit_WP[i].Z, Clintar_spirit_WP[i].O, Clintar_spirit_WP[i].waitTime);
                 }
                 PlayerGUID = player->GetGUID();
-                Start(true, false, PlayerGUID);
+                Start(true, player->GetGUID());
                 me->SetDisplayId(me->GetCreatureTemplate()->Modelid1);
                 me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
             }
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -59,6 +59,8 @@ enum Gilthares
     AREA_MERCHANT_COAST         = 391
 };
 
+static constexpr uint32 PATH_ESCORT_GILTHARES = 27722;
+
 class npc_gilthares : public CreatureScript
 {
 public:
@@ -122,7 +124,8 @@ class npc_gilthares : public CreatureScript
                 me->SetStandState(UNIT_STAND_STATE_STAND);
 
                 Talk(SAY_GIL_START, player);
-                Start(false, false, player->GetGUID(), quest);
+                LoadPath(PATH_ESCORT_GILTHARES);
+                Start(false, player->GetGUID(), quest);
             }
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ Position const AmbushMoveTo[] =`
`62`	`62`	`{ 70.886589f, -2874.335449f, 116.675f, 0.0f }`
`63`	`63`	`};`
`64`	`64`
	`65`	`+static constexpr uint32 PATH_ESCORT_RINJI = 62242;`
	`66`	`+`
`65`	`67`	`class npc_rinji : public CreatureScript`
`66`	`68`	`{`
`67`	`69`	`public:`
`@@ -140,7 +142,8 @@ class npc_rinji : public CreatureScript`
`140`	`142`	`if (GameObject* go = me->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE))`
`141`	`143`	`go->UseDoorOrButton();`
`142`	`144`
`143`		`- EscortAI::Start(false, false, player->GetGUID(), quest);`
	`145`	`+ LoadPath(PATH_ESCORT_RINJI);`
	`146`	`+ Start(false, player->GetGUID(), quest);`
`144`	`147`	`}`
`145`	`148`	`}`
`146`	`149`
`@@ -164,7 +167,6 @@ class npc_rinji : public CreatureScript`
`164`	`167`	`case 17:`
`165`	`168`	`Talk(SAY_RIN_COMPLETE, player);`
`166`	`169`	`player->GroupEventHappens(QUEST_RINJI_TRAPPED, me);`
`167`		`- SetRun();`
`168`	`170`	`postEventCount = 1;`
`169`	`171`	`break;`
`170`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,8 @@ enum TyrionSpybot`
`319`	`319`	`NPC_LORD_GREGOR_LESCOVAR = 1754,`
`320`	`320`	`};`
`321`	`321`
	`322`	`+static constexpr uint32 PATH_ESCORT_LESCOVAR = 70850;`
	`323`	`+`
`322`	`324`	`class npc_tyrion_spybot : public CreatureScript`
`323`	`325`	`{`
`324`	`326`	`public:`
`@@ -438,8 +440,12 @@ class npc_tyrion_spybot : public CreatureScript`
`438`	`440`	`{`
`439`	`441`	`if (Player* player = GetPlayerForEscort())`
`440`	`442`	`{`
`441`		`- ENSURE_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, player->GetGUID());`
`442`		`- ENSURE_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f);`
	`443`	`+ if (EscortAI* ai = CAST_AI(EscortAI, pLescovar->AI()))`
	`444`	`+ {`
	`445`	`+ ai->LoadPath(PATH_ESCORT_LESCOVAR);`
	`446`	`+ ai->Start(false, player->GetGUID());`
	`447`	`+ ai->SetMaxPlayerDistance(200.0f);`
	`448`	`+ }`
`443`	`449`	`}`
`444`	`450`	`}`
`445`	`451`	`me->DisappearAndDie();`
`@@ -468,6 +474,8 @@ enum Tyrion`
`468`	`474`	`NPC_TYRION_SPYBOT = 8856`
`469`	`475`	`};`
`470`	`476`
	`477`	`+static constexpr uint32 PATH_ESCORT_TYRION_SPYBOT = 14034;`
	`478`	`+`
`471`	`479`	`class npc_tyrion : public CreatureScript`
`472`	`480`	`{`
`473`	`481`	`public:`
`@@ -483,8 +491,12 @@ class npc_tyrion : public CreatureScript`
`483`	`491`	`{`
`484`	`492`	`if (Creature* spybot = me->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true))`
`485`	`493`	`{`
`486`		`- ENSURE_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, spybot->AI())->Start(false, false, player->GetGUID());`
`487`		`- ENSURE_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, spybot->AI())->SetMaxPlayerDistance(200.0f);`
	`494`	`+ if (EscortAI* ai = CAST_AI(EscortAI, spybot->AI()))`
	`495`	`+ {`
	`496`	`+ ai->LoadPath(PATH_ESCORT_TYRION_SPYBOT);`
	`497`	`+ ai->Start(false, player->GetGUID());`
	`498`	`+ ai->SetMaxPlayerDistance(200.0f);`
	`499`	`+ }`
`488`	`500`	`}`
`489`	`501`	`}`
`490`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,8 @@ enum Remtravel`
`196`	`196`	`NPC_GRAVEL_GEO = 2160`
`197`	`197`	`};`
`198`	`198`
	`199`	`+static constexpr uint32 PATH_ESCORT_PROSPECTOR_REMTRAVEL = 23338;`
	`200`	`+`
`199`	`201`	`class npc_prospector_remtravel : public CreatureScript`
`200`	`202`	`{`
`201`	`203`	`public:`
`@@ -284,7 +286,8 @@ class npc_prospector_remtravel : public CreatureScript`
`284`	`286`	`{`
`285`	`287`	`if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)`
`286`	`288`	`{`
`287`		`- Start(false, false, player->GetGUID());`
	`289`	`+ LoadPath(PATH_ESCORT_PROSPECTOR_REMTRAVEL);`
	`290`	`+ Start(false, player->GetGUID());`
`288`	`291`	`me->SetFaction(FACTION_ESCORTEE_A_NEUTRAL_PASSIVE);`
`289`	`292`	`}`
`290`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ class npc_clintar_spirit : public CreatureScript`
`196`	`196`	`AddWaypoint(i, Clintar_spirit_WP[i].X, Clintar_spirit_WP[i].Y, Clintar_spirit_WP[i].Z, Clintar_spirit_WP[i].O, Clintar_spirit_WP[i].waitTime);`
`197`	`197`	`}`
`198`	`198`	`PlayerGUID = player->GetGUID();`
`199`		`- Start(true, false, PlayerGUID);`
	`199`	`+ Start(true, player->GetGUID());`
`200`	`200`	`me->SetDisplayId(me->GetCreatureTemplate()->Modelid1);`
`201`	`201`	`me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ enum Gilthares`
`59`	`59`	`AREA_MERCHANT_COAST = 391`
`60`	`60`	`};`
`61`	`61`
	`62`	`+static constexpr uint32 PATH_ESCORT_GILTHARES = 27722;`
	`63`	`+`
`62`	`64`	`class npc_gilthares : public CreatureScript`
`63`	`65`	`{`
`64`	`66`	`public:`
`@@ -122,7 +124,8 @@ class npc_gilthares : public CreatureScript`
`122`	`124`	`me->SetStandState(UNIT_STAND_STATE_STAND);`
`123`	`125`
`124`	`126`	`Talk(SAY_GIL_START, player);`
`125`		`- Start(false, false, player->GetGUID(), quest);`
	`127`	`+ LoadPath(PATH_ESCORT_GILTHARES);`
	`128`	`+ Start(false, player->GetGUID(), quest);`
`126`	`129`	`}`
`127`	`130`	`}`
`128`	`131`	`};`