aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms
diff options
context:
space:
mode:
authorModoX <moardox@gmail.com>2023-04-08 01:33:05 +0200
committerGitHub <noreply@github.com>2023-04-08 01:33:05 +0200
commit356c98579babd1aef12e2b5ef28baba2403368d0 (patch)
treee4824b312ecbcf462418d1d149614b71effd5d02 /src/server/scripts/EasternKingdoms
parent7d5d3cf655b3e701d8a570b03499a388476cbdf9 (diff)
Core/SAI: Drop waypoints table and move existing rows to waypoint_data table (#28834)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp10
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp10
-rw-r--r--src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp40
10 files changed, 39 insertions, 39 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
index 877d4dc23b7..26da4e9054d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
@@ -30,7 +30,7 @@ enum Spells
enum Paths
{
- GIZRUL_PATH = 402450
+ GIZRUL_PATH = 3219600
};
enum Events
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
index 1de8cfcd416..ad3f9a32ddc 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
@@ -36,7 +36,7 @@ enum Misc
{
NEFARIUS_PATH_2 = 1379671,
NEFARIUS_PATH_3 = 1379672,
- GYTH_PATH_1 = 1379681,
+ GYTH_PATH_1 = 11037448,
};
enum Events
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index e2cb6e5d13f..905140b967e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -60,11 +60,11 @@ enum Adds
enum Misc
{
- NEFARIUS_PATH_1 = 1379670,
- NEFARIUS_PATH_2 = 1379671,
- NEFARIUS_PATH_3 = 1379672,
- REND_PATH_1 = 1379680,
- REND_PATH_2 = 1379681,
+ NEFARIUS_PATH_1 = 11037360,
+ NEFARIUS_PATH_2 = 11037368,
+ NEFARIUS_PATH_3 = 11037376,
+ REND_PATH_1 = 11037440,
+ REND_PATH_2 = 11037448,
};
/*
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index ae0b6585974..310ae35e096 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -86,8 +86,8 @@ enum Gossip
enum Paths
{
- NEFARIUS_PATH_2 = 1379671,
- NEFARIUS_PATH_3 = 1379672
+ NEFARIUS_PATH_2 = 11037368,
+ NEFARIUS_PATH_3 = 11037376
};
enum GameObjects
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index 63041a51618..cd6e23cb328 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -93,7 +93,7 @@ enum MTInstanceText
enum MTMovementData
{
- PATH_KALECGOS_FLIGHT = 248440
+ PATH_KALECGOS_FLIGHT = 1987520
};
template <class AI, class T>
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index d60ed5a3f51..11cc168d497 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -261,7 +261,7 @@ struct npc_koltira_deathweaver : public ScriptedAI
me->SetWalk(false);
me->SetImmuneToNPC(false);
DoCastSelf(SPELL_HERO_AGGRO);
- me->GetMotionMaster()->MovePath(NPC_KOLTIRA, false);
+ me->GetMotionMaster()->MovePath(NPC_KOLTIRA << 3, false);
break;
case EVENT_CHECK_PLAYER:
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index e62cdf8d8c0..c102f54afad 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -64,7 +64,7 @@ enum Misc
{
WEAPON_KIRTONOS_STAFF = 11365,
POINT_KIRTONOS_LAND = 13,
- KIRTONOS_PATH = 105061
+ KIRTONOS_PATH = 840488
};
Position const PosMove[2] =
diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
index 6a2766ce427..19650e7f58a 100644
--- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
@@ -25,11 +25,11 @@
enum COG_Paths
{
- STORMWIND_PATH = 80500,
- GOLDSHIRE_PATH = 80501,
- WOODS_PATH = 80502,
- HOUSE_PATH = 80503,
- LISA_PATH = 80700
+ STORMWIND_PATH = 644000,
+ GOLDSHIRE_PATH = 644008,
+ WOODS_PATH = 644016,
+ HOUSE_PATH = 644024,
+ LISA_PATH = 645600
};
enum COG_Waypoints
diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
index ac982ea88b5..0c52922b0a1 100644
--- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
@@ -27,8 +27,8 @@ enum Partygoer_Pather
EVENT_REMOVE_EQUIPMENT_PATHER,
EVENT_STOP_DANCING_PATHER,
- PATH_FIRST_PATH = 594440,
- PATH_LAST_PATH = 594444,
+ PATH_FIRST_PATH = 4755520,
+ PATH_LAST_PATH = 4755552,
};
struct npc_partygoer_pather : public ScriptedAI
diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index a82cf68206c..d941582dd5b 100644
--- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
@@ -60,12 +60,12 @@ enum HordeHauler
TALK_ON_SEPULCHER = 2,
TALK_ON_FORSAKEN_FRONT = 3,
- PATH_FROM_NORTH_TO_SOUTH = 447310,
- PATH_TROOPER_1 = 447320,
- PATH_TROOPER_2 = 447321,
- PATH_TROOPER_3 = 447322,
- PATH_TROOPER_4 = 447323,
- PATH_TROOPER_5 = 447324,
+ PATH_FROM_NORTH_TO_SOUTH = 3578480,
+ PATH_TROOPER_1 = 3578560,
+ PATH_TROOPER_2 = 3578568,
+ PATH_TROOPER_3 = 3578576,
+ PATH_TROOPER_4 = 3578584,
+ PATH_TROOPER_5 = 3578592,
WAYPOINT_ON_FORSAKEN_HIGH = 11,
WAYPOINT_ON_SEPULCHER = 35,
@@ -340,8 +340,8 @@ enum QuestTheWarchiefCometh
TALK_CROMUSH_COMETH_0 = 0,
TALK_CROMUSH_COMETH_1 = 1,
- PATH_CROMUSH = 446402,
- PATH_GARROSH = 446290,
+ PATH_CROMUSH = 3571216,
+ PATH_GARROSH = 3570320,
POINT_AGATHA_PRE_RISE = 1,
POINT_AGATHA_RISE = 2,
@@ -1417,9 +1417,9 @@ enum ForsakenBat
TALK_BAT_ARRIVED_TO_ISLE = 0,
TALK_BAT_GOING_HOME = 1,
- PATH_BAT_TO_LAKE = 448210,
- PATH_BAT_AROUND_LAKE = 448211,
- PATH_BAT_TO_HOME = 448212,
+ PATH_BAT_TO_LAKE = 3585680,
+ PATH_BAT_AROUND_LAKE = 3585688,
+ PATH_BAT_TO_HOME = 3585696,
WAYPOINT_LAST_POINT_TO_LAKE = 8,
WAYPOINT_LAST_POINT_AROUND_LAKE = 32,
@@ -1660,8 +1660,8 @@ enum DeathstalkerRaneYorick
TALK_YORICK_EXSANGUINATE_SUMMON = 0,
TALK_YORICK_EXSANGUINATE_HIDE = 1,
- PATH_YORICK_UP = 448820,
- PATH_YORICK_HIDE = 448821,
+ PATH_YORICK_UP = 3590560,
+ PATH_YORICK_HIDE = 3590568,
WAYPOINT_CLOSE_TO_ARMOIRE = 15,
WAYPOINT_HIDDEN_NEXT_TO_ARMOIRE = 2
@@ -1909,12 +1909,12 @@ enum WaitingToExsanguinate
TALK_BLOODFANG_EXSANGUINATE_9 = 9,
TALK_BLOODFANG_EXSANGUINATE_10 = 10,
- PATH_CROWLEY_ENTER = 448830,
- PATH_BLOODFANG_ENTER = 448840,
- PATH_BLOODFANG_NEAR_YORICK = 448841,
- PATH_BLOODFANG_WITH_YORICK = 448842,
- PATH_BLOODFANG_EXIT = 448843,
- PATH_CROWLEY_EXIT = 448831
+ PATH_CROWLEY_ENTER = 3590640,
+ PATH_BLOODFANG_ENTER = 3590720,
+ PATH_BLOODFANG_NEAR_YORICK = 3590728,
+ PATH_BLOODFANG_WITH_YORICK = 3590736,
+ PATH_BLOODFANG_EXIT = 3590744,
+ PATH_CROWLEY_EXIT = 3590648
};
// 44893 - Armoire
@@ -4140,7 +4140,7 @@ enum AgathaFenrisIsle
TALK_AGATHA_POST_EVENT1 = 3,
TALK_AGATHA_POST_EVENT2 = 4,
- PATH_AGATHA_TO_FORSAKEN = 449510,
+ PATH_AGATHA_TO_FORSAKEN = 3596080,
WAYPOINT_SPEED_UP = 14,
WAYPOINT_ARRIVED_TO_FORSAKEN = 19,