Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/VP: updated remaining scripts to new model, applied coding standards and removed some unneeded function calls

Browse Source
This commit is contained in:
Ovahlord
2019-08-15 18:39:40 +02:00
parent 161aa6f195
commit d135e6eaf9
5 changed files with 460 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
View File

@@ -68,9 +68,9 @@ enum Points
POINT_ROTATE = 1
};
#define MAX_VORTEX_POINTS 8
static constexpr uint8 MaxVortexPoints = 8;
Position const ErtansVortexPoints[MAX_VORTEX_POINTS] =
Position const ErtansVortexPoints[MaxVortexPoints] =
{
{ -744.889f, 3.98611f, 635.6728f }, // South
{ -737.552f, 21.592f, 635.6728f }, // South-West
@@ -82,7 +82,7 @@ Position const ErtansVortexPoints[MAX_VORTEX_POINTS] =
{ -737.649f, -13.5347f, 635.6728f } // South-East
};
Position const ErtansVortexMiddlePoints[MAX_VORTEX_POINTS] =
Position const ErtansVortexMiddlePoints[MaxVortexPoints] =
{
{ -724.3819f, 2.915083f, 635.6728f }, // South
{ -724.0161f, 6.648534f, 635.6728f }, // South-West
@@ -105,9 +105,9 @@ struct boss_grand_vizier_ertan : public BossAI
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
Talk(SAY_AGGRO);
for (uint8 i = 0; i < MAX_VORTEX_POINTS; i++)
for (uint8 i = 0; i < MaxVortexPoints; i++)
if (Creature * ertansVortex = DoSummon(NPC_ERTANS_VORTEX, ErtansVortexPoints[i], 0, TEMPSUMMON_MANUAL_DESPAWN))
ertansVortex->GetMotionMaster()->MovePoint(POINT_ROTATE + i, ErtansVortexPoints[i + 1 < MAX_VORTEX_POINTS ? i + 1 : 0]);
ertansVortex->GetMotionMaster()->MovePoint(POINT_ROTATE + i, ErtansVortexPoints[i + 1 < MaxVortexPoints ? i + 1 : 0]);
events.ScheduleEvent(EVENT_STORMS_EDGE, 24s);
events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 1ms);
@@ -199,7 +199,7 @@ struct npc_ertan_ertans_vortex : public NullCreatureAI
if (movementType != POINT_MOTION_TYPE || pointId == POINT_NONE)
return;
_nextPointId = pointId < MAX_VORTEX_POINTS ? pointId : 0;
_nextPointId = pointId < MaxVortexPoints ? pointId : 0;
_events.ScheduleEvent(EVENT_MOVE_POINT, 1ms);
};

1038
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
View File

@@ -69,6 +69,8 @@ enum VPCreatureIds
NPC_SLIPSTREAM_LANDING_ZONE = 45504,
NPC_HOWLING_GALE = 45572,
NPC_ZEPHYR = 45991,
NPC_SKYFALL = 45981,
NPC_SKYFALL_STAR = 52019,
// Grounding Field
NPC_GROUNDING_FIELD = 47085