diff --git a/data/sql/updates/pending_db_world/anetheron_waypoints.sql b/data/sql/updates/pending_db_world/anetheron_waypoints.sql new file mode 100644 index 000000000..7a53f7914 --- /dev/null +++ b/data/sql/updates/pending_db_world/anetheron_waypoints.sql @@ -0,0 +1,33 @@ +-- rage winterchill +DELETE FROM `waypoint_data` WHERE `id` = 177670; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(177670, 1, 4896.08, -1576.35, 1333.65, 0, 0, 0, 0, 100, 0), +(177670, 2, 4898.68, -1615.02, 1329.48, 0, 0, 0, 0, 100, 0), +(177670, 3, 4907.12, -1667.08, 1321.00, 0, 0, 0, 0, 100, 0), +(177670, 4, 4963.18, -1699.35, 1340.51, 0, 0, 0, 0, 100, 0), +(177670, 5, 4989.16, -1716.67, 1335.74, 0, 0, 0, 0, 100, 0), +(177670, 6, 5026.27, -1736.89, 1323.02, 0, 0, 0, 0, 100, 0), +(177670, 7, 5037.77, -1770.56, 1324.36, 0, 0, 0, 0, 100, 0), +(177670, 8, 5067.23, -1789.95, 1321.17, 0, 0, 0, 0, 100, 0); +-- anetheron +DELETE FROM `waypoint_data` WHERE `id` = 178080; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(178080, 1, 4896.08, -1576.35, 1333.65, 0, 0, 0, 0, 100, 0), +(178080, 2, 4898.68, -1615.02, 1329.48, 0, 0, 0, 0, 100, 0), +(178080, 3, 4907.12, -1667.08, 1321.00, 0, 0, 0, 0, 100, 0), +(178080, 4, 4963.18, -1699.35, 1340.51, 0, 0, 0, 0, 100, 0), +(178080, 5, 4989.16, -1716.67, 1335.74, 0, 0, 0, 0, 100, 0), +(178080, 6, 5026.27, -1736.89, 1323.02, 0, 0, 0, 0, 100, 0), +(178080, 7, 5037.77, -1770.56, 1324.36, 0, 0, 0, 0, 100, 0), +(178080, 8, 5067.23, -1789.95, 1321.17, 0, 0, 0, 0, 100, 0); +-- kaz'rogal +DELETE FROM `waypoint_data` WHERE `id` = 178880; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(178880, 1, 5492.91, -2404.61, 1462.63, 0, 0, 0, 0, 100, 0), +(178880, 2, 5531.76, -2460.87, 1469.55, 0, 0, 0, 0, 100, 0), +(178880, 3, 5554.58, -2514.66, 1476.12, 0, 0, 0, 0, 100, 0), +(178880, 4, 5554.16, -2567.23, 1479.90, 0, 0, 0, 0, 100, 0), +(178880, 5, 5540.67, -2625.99, 1480.89, 0, 0, 0, 0, 100, 0), +(178880, 6, 5508.16, -2659.2, 1480.15, 0, 0, 0, 0, 100, 0), +(178880, 7, 5489.62, -2704.05, 1482.18, 0, 0, 0, 0, 100, 0), +(178880, 8, 5457.04, -2726.26, 1485.10, 0, 0, 0, 0, 100, 0); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index b8f078695..6a93be823 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -40,6 +40,11 @@ enum Texts SAY_ONAGGRO = 5, }; +enum Misc +{ + PATH_ANETHERON = 178080, + POINT_COMBAT_START = 7 +}; class boss_anetheron : public CreatureScript { public: @@ -92,7 +97,7 @@ public: void WaypointReached(uint32 waypointId) override { - if (waypointId == 7) + if (waypointId == POINT_COMBAT_START) { Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) @@ -117,16 +122,7 @@ public: if (!go) { go = true; - AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); - AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); - AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); - AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); - AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); - AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); - AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); - AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); - Start(false, true); - SetDespawnAtEnd(false); + me->GetMotionMaster()->MovePath(PATH_ANETHERON, false); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index b5b3b63a8..de521ec2a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -43,6 +43,12 @@ enum Sounds SOUND_ONDEATH = 11018, }; +enum Misc +{ + PATH_KAZROGAL = 178880, + POINT_COMBAT_START = 7 +}; + class boss_kazrogal : public CreatureScript { public: @@ -93,7 +99,7 @@ public: void WaypointReached(uint32 waypointId) override { - if (waypointId == 7 && instance) + if (waypointId == POINT_COMBAT_START && instance) { Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) @@ -118,16 +124,7 @@ public: if (!go) { go = true; - AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); - AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); - AddWaypoint(2, 5554.58f, -2514.66f, 1476.12f); - AddWaypoint(3, 5554.16f, -2567.23f, 1479.90f); - AddWaypoint(4, 5540.67f, -2625.99f, 1480.89f); - AddWaypoint(5, 5508.16f, -2659.2f, 1480.15f); - AddWaypoint(6, 5489.62f, -2704.05f, 1482.18f); - AddWaypoint(7, 5457.04f, -2726.26f, 1485.10f); - Start(false, true); - SetDespawnAtEnd(false); + me->GetMotionMaster()->MovePath(PATH_KAZROGAL, false); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 49590d280..42b539411 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -37,6 +37,12 @@ enum Texts SAY_ONAGGRO = 4 }; +enum Misc +{ + PATH_RAGE_WINTERCHILL = 177670, + POINT_COMBAT_START = 7 +}; + class boss_rage_winterchill : public CreatureScript { public: @@ -87,7 +93,7 @@ public: void WaypointReached(uint32 waypointId) override { - if (waypointId == 7 && instance) + if (waypointId == POINT_COMBAT_START && instance) { Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) @@ -112,16 +118,7 @@ public: if (!go) { go = true; - AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); - AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); - AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); - AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); - AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); - AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); - AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); - AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); - Start(false, true); - SetDespawnAtEnd(false); + me->GetMotionMaster()->MovePath(PATH_RAGE_WINTERCHILL, false); } }