fix(Scripts/Hyjal): move Hyjal boss waypoints to DB (#18299)

* put anetheron movement in wps

* move all wps to db for bosses
This commit is contained in:
Dan
2024-02-12 12:17:39 +01:00
committed by GitHub
parent fb49062a56
commit a4dc083b42
4 changed files with 56 additions and 33 deletions

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}