josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+108 -108
View File
@@ -153,24 +153,24 @@ enum MalygosSays
// Sniffed data
const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] =
{
{782.9821f,1296.652f,282.1114f},
{779.5459f,1287.228f,282.1393f},
{773.0028f,1279.52f,282.4164f},
{764.3626f,1274.476f,282.4731f},
{754.3961f,1272.639f,282.4171f},
{744.4422f,1274.412f,282.222f},
{735.575f,1279.742f,281.9674f},
{729.2788f,1287.187f,281.9943f},
{726.1191f,1296.688f,282.2997f},
{725.9396f,1306.531f,282.2448f},
{729.3045f,1316.122f,281.9108f},
{735.8322f,1323.633f,282.1887f},
{744.4616f,1328.999f,281.9948f},
{754.4739f,1330.666f,282.049f},
{764.074f,1329.053f,281.9949f},
{772.8409f,1323.951f,282.077f},
{779.5085f,1316.412f,281.9145f},
{782.8365f,1306.778f,282.3035f},
{782.9821f, 1296.652f, 282.1114f},
{779.5459f, 1287.228f, 282.1393f},
{773.0028f, 1279.52f, 282.4164f},
{764.3626f, 1274.476f, 282.4731f},
{754.3961f, 1272.639f, 282.4171f},
{744.4422f, 1274.412f, 282.222f},
{735.575f, 1279.742f, 281.9674f},
{729.2788f, 1287.187f, 281.9943f},
{726.1191f, 1296.688f, 282.2997f},
{725.9396f, 1306.531f, 282.2448f},
{729.3045f, 1316.122f, 281.9108f},
{735.8322f, 1323.633f, 282.1887f},
{744.4616f, 1328.999f, 281.9948f},
{754.4739f, 1330.666f, 282.049f},
{764.074f, 1329.053f, 281.9949f},
{772.8409f, 1323.951f, 282.077f},
{779.5085f, 1316.412f, 281.9145f},
{782.8365f, 1306.778f, 282.3035f},
};
#define GROUND_Z 268
@@ -179,22 +179,22 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] =
#define MALYGOS_MAX_WAYPOINTS 16
const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] =
{
{812.7299f,1391.672f,283.2763f},
{848.2912f,1358.61f,283.2763f},
{853.9227f,1307.911f,283.2763f},
{847.1437f,1265.538f,283.2763f},
{839.9229f,1245.245f,283.2763f},
{827.3463f,1221.818f,283.2763f},
{803.2727f,1203.851f,283.2763f},
{772.9372f,1197.981f,283.2763f},
{732.1138f,1200.647f,283.2763f},
{693.8761f,1217.995f,283.2763f},
{664.5038f,1256.539f,283.2763f},
{650.1497f,1303.485f,283.2763f},
{662.9109f,1350.291f,283.2763f},
{677.6391f,1377.607f,283.2763f},
{704.8198f,1401.162f,283.2763f},
{755.2642f,1417.1f,283.2763f},
{812.7299f, 1391.672f, 283.2763f},
{848.2912f, 1358.61f, 283.2763f},
{853.9227f, 1307.911f, 283.2763f},
{847.1437f, 1265.538f, 283.2763f},
{839.9229f, 1245.245f, 283.2763f},
{827.3463f, 1221.818f, 283.2763f},
{803.2727f, 1203.851f, 283.2763f},
{772.9372f, 1197.981f, 283.2763f},
{732.1138f, 1200.647f, 283.2763f},
{693.8761f, 1217.995f, 283.2763f},
{664.5038f, 1256.539f, 283.2763f},
{650.1497f, 1303.485f, 283.2763f},
{662.9109f, 1350.291f, 283.2763f},
{677.6391f, 1377.607f, 283.2763f},
{704.8198f, 1401.162f, 283.2763f},
{755.2642f, 1417.1f, 283.2763f},
};
#define MAX_SUMMONS_PHASE_TWO 4
@@ -202,7 +202,7 @@ const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] =
#define MAX_MALYGOS_POS 2
const Position MalygosPositions[MAX_MALYGOS_POS] =
{
{754.544f,1301.71f,320.0f},
{754.544f, 1301.71f, 320.0f},
{754.39f, 1301.27f, 292.91f}
};
@@ -232,14 +232,14 @@ public:
bersekerTimer = 0;
currentPos = 0;
SetPhase(PHASE_ONE,true);
SetPhase(PHASE_ONE, true);
delayedMovementTimer = 8000;
delayedMovement = false;
summonDeaths = 0;
me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
cannotMove = true;
}
@@ -293,7 +293,7 @@ public:
if (!instance)
return;
SetPhase(PHASE_THREE,true);
SetPhase(PHASE_THREE, true);
// this despawns Hover Disks
summons.DespawnAll();
@@ -308,16 +308,16 @@ public:
continue;
// The rest is handled in the AI of the vehicle.
target->CastSpell(target,SPELL_SUMMOM_RED_DRAGON,true);
target->CastSpell(target, SPELL_SUMMOM_RED_DRAGON, true);
}
}
if (GameObject* go = GameObject::GetGameObject(*me,instance->GetData64(DATA_PLATFORM)))
if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_PLATFORM)))
go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); // In sniffs it has this flag, but i don't know how is applied.
// pos sniffed
me->GetMotionMaster()->MoveIdle();
me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ());
me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ());
}
void SetPhaseEvents(uint8 _phase)
@@ -325,23 +325,23 @@ public:
switch (_phase)
{
case PHASE_ONE:
events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(15,20)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_VORTEX,urand(30,40)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(15, 20)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_VORTEX, urand(30, 40)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, _phase);
break;
case PHASE_TWO:
events.ScheduleEvent(EVENT_YELL_0,0,0,_phase);
events.ScheduleEvent(EVENT_YELL_1,24*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(2,5)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_YELL_0, 0, 0, _phase);
events.ScheduleEvent(EVENT_YELL_1, 24*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(2, 5)*IN_MILLISECONDS, 0, _phase);
break;
case PHASE_THREE:
events.ScheduleEvent(EVENT_YELL_2,0,0,_phase);
events.ScheduleEvent(EVENT_YELL_3,8*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_YELL_4,16*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,_phase);
events.ScheduleEvent(EVENT_YELL_2, 0, 0, _phase);
events.ScheduleEvent(EVENT_YELL_3, 8*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_YELL_4, 16*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, _phase);
events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, _phase);
break;
default:
break;
@@ -353,7 +353,7 @@ public:
_EnterCombat();
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Talk(SAY_AGGRO_P_ONE);
@@ -409,17 +409,17 @@ public:
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MovePoint(MOVE_VORTEX,MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ());
me->GetMotionMaster()->MovePoint(MOVE_VORTEX, MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ());
// continues in MovementInform function.
}
void ExecuteVortex()
{
DoCast(me,SPELL_VORTEX_1,true);
DoCast(me,SPELL_VORTEX_2,true);
DoCast(me, SPELL_VORTEX_1, true);
DoCast(me, SPELL_VORTEX_2, true);
// the vortex execution continues in the dummy effect of this spell (see its script)
DoCast(me,SPELL_VORTEX_3,true);
DoCast(me, SPELL_VORTEX_3, true);
}
void MovementInform(uint32 type, uint32 id)
@@ -436,7 +436,7 @@ public:
case MOVE_DEEP_BREATH_ROTATION:
currentPos = currentPos == MALYGOS_MAX_WAYPOINTS - 1 ? 0 : currentPos+1;
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]);
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]);
break;
case MOVE_INIT_PHASE_ONE:
me->SetInCombatWithZone();
@@ -451,24 +451,24 @@ public:
void StartPhaseTwo()
{
SetPhase(PHASE_TWO,true);
SetPhase(PHASE_TWO, true);
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->GetMotionMaster()->MoveIdle();
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[0]);
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[0]);
Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]);
Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]);
if (summon && summon->IsAIEnabled)
summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_2);
summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[0]);
summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[0]);
if (summon && summon->IsAIEnabled)
summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_1);
for (uint8 i = 0; i < 2; i++)
{
// not sure about its position.
summon = me->SummonCreature(NPC_HOVER_DISK_MELEE,HoverDiskWaypoints[0]);
summon = me->SummonCreature(NPC_HOVER_DISK_MELEE, HoverDiskWaypoints[0]);
if (summon)
summon->SetInCombatWithZone();
}
@@ -496,7 +496,7 @@ public:
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE)
{
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ());
me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ());
}
}
}
@@ -506,7 +506,7 @@ public:
{
if (delayedMovementTimer <= diff)
{
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]);
me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]);
delayedMovementTimer = 8000;
delayedMovement = false;
} delayedMovementTimer -= diff;
@@ -544,38 +544,38 @@ public:
Talk(SAY_AGGRO_P_TWO);
break;
case EVENT_ARCANE_BREATH:
DoCast(me->getVictim(),SPELL_ARCANE_BREATH);
events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(35,60)*IN_MILLISECONDS,0,PHASE_ONE);
DoCast(me->getVictim(), SPELL_ARCANE_BREATH);
events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(35, 60)*IN_MILLISECONDS, 0, PHASE_ONE);
break;
case EVENT_ARCANE_STORM:
DoCast(me->getVictim(),SPELL_ARCANE_STORM);
events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,PHASE_ONE);
DoCast(me->getVictim(), SPELL_ARCANE_STORM);
events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, PHASE_ONE);
break;
case EVENT_VORTEX:
PrepareForVortex();
events.ScheduleEvent(EVENT_VORTEX,urand(60,80)*IN_MILLISECONDS,0,PHASE_ONE);
events.ScheduleEvent(EVENT_VORTEX, urand(60, 80)*IN_MILLISECONDS, 0, PHASE_ONE);
break;
case EVENT_POWER_SPARKS:
instance->SetData(DATA_POWER_SPARKS_HANDLING,0);
events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,PHASE_ONE);
instance->SetData(DATA_POWER_SPARKS_HANDLING, 0);
events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, PHASE_ONE);
break;
case EVENT_SURGE_POWER:
me->GetMotionMaster()->MoveIdle();
delayedMovement = true;
DoCast(SPELL_SURGE_POWER);
events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,PHASE_TWO);
events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, PHASE_TWO);
break;
case EVENT_SUMMON_ARCANE:
DoCast(SPELL_SUMMON_ARCANE_BOMB);
events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(12,15)*IN_MILLISECONDS,0,PHASE_TWO);
events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(12, 15)*IN_MILLISECONDS, 0, PHASE_TWO);
break;
case EVENT_SURGE_POWER_PHASE_3:
DoCast(GetTargetPhaseThree(),SPELL_SURGE_POWER_PHASE_3);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,PHASE_THREE);
DoCast(GetTargetPhaseThree(), SPELL_SURGE_POWER_PHASE_3);
events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, PHASE_THREE);
break;
case EVENT_STATIC_FIELD:
DoCast(GetTargetPhaseThree(),SPELL_STATIC_FIELD);
events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,PHASE_THREE);
DoCast(GetTargetPhaseThree(), SPELL_STATIC_FIELD);
events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, PHASE_THREE);
break;
default:
break;
@@ -587,7 +587,7 @@ public:
Unit* GetTargetPhaseThree()
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0);
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0);
// we are a drake
if (target->GetVehicleKit())
@@ -643,7 +643,7 @@ public:
// each player will enter to the trigger vehicle (entry 30090) already spawned (each one can hold up to 5 players, it has 5 seats)
// the players enter to the vehicles casting SPELL_VORTEX_4 OR SPELL_VORTEX_5
if (InstanceScript* instance = caster->GetInstanceScript())
instance->SetData(DATA_VORTEX_HANDLING,0);
instance->SetData(DATA_VORTEX_HANDLING, 0);
// the rest of the vortex execution continues when SPELL_VORTEX_2 is removed.
}
@@ -735,23 +735,23 @@ public:
void Reset()
{
summonTimer = urand(5,7)*IN_MILLISECONDS;
summonTimer = urand(5, 7)*IN_MILLISECONDS;
}
void UpdateAI(const uint32 diff)
{
if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) &&
!me->HasAura(SPELL_PORTAL_OPENED))
DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true);
DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true);
if (instance)
{
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
{
if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE)
{
me->RemoveAura(SPELL_PORTAL_OPENED);
DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true);
DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true);
}
}
}
@@ -762,7 +762,7 @@ public:
if (summonTimer <= diff)
{
DoCast(SPELL_SUMMON_POWER_PARK);
summonTimer = urand(5,7)*IN_MILLISECONDS;
summonTimer = urand(5, 7)*IN_MILLISECONDS;
} else summonTimer -= diff;
}
@@ -808,8 +808,8 @@ public:
if (instance)
{
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f);
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f);
}
}
@@ -818,7 +818,7 @@ public:
if (!instance)
return;
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
{
if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE)
{
@@ -833,7 +833,7 @@ public:
}
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f);
me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f);
}
}
@@ -842,7 +842,7 @@ public:
if (damage > me->GetMaxHealth())
{
damage = 0;
DoCast(me,SPELL_POWER_SPARK_DEATH,true);
DoCast(me, SPELL_POWER_SPARK_DEATH, true);
me->DespawnOrUnsummon(1000);
}
}
@@ -893,11 +893,11 @@ public:
// This will only be called if the passenger dies
if (instance)
{
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
malygos->AI()->SetData(DATA_SUMMON_DEATHS,malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1);
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1);
}
me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
me->GetMotionMaster()->MoveIdle();
@@ -906,8 +906,8 @@ public:
{
// Hack: Fall ground function can fail (remember the platform is a gameobject), we will teleport the disk to the ground
if (me->GetPositionZ() > GROUND_Z)
me->NearTeleportTo(me->GetPositionX(),me->GetPositionY(),GROUND_Z,0);
me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation());
me->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), GROUND_Z, 0);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
me->setFaction(FACTION_FRIENDLY);
me->AI()->EnterEvadeMode();
}
@@ -928,14 +928,14 @@ public:
{
case ACTION_HOVER_DISK_START_WP_1:
for (uint8 i = 0; i < MAX_HOVER_DISK_WAYPOINTS; i++)
AddWaypoint(i,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ());
AddWaypoint(i, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ());
break;
case ACTION_HOVER_DISK_START_WP_2:
{
uint8 count = 0;
for (uint8 i = MAX_HOVER_DISK_WAYPOINTS-1; i > 0; i--)
{
AddWaypoint(count,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ());
AddWaypoint(count, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ());
count++;
}
break;
@@ -944,7 +944,7 @@ public:
return;
}
Start(true,false,0,0,false,true);
Start(true, false, 0, 0, false, true);
}
void UpdateEscortAI(const uint32 /*diff*/)
@@ -985,7 +985,7 @@ public:
void Reset()
{
DoCast(me,SPELL_ARCANE_OVERLOAD,false);
DoCast(me, SPELL_ARCANE_OVERLOAD, false);
}
void UpdateAI(const uint32 diff)
@@ -1023,12 +1023,12 @@ public:
if (!instance)
return;
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
{
if (Unit* summoner = me->ToTempSummon()->GetSummoner())
{
summoner->CastSpell(me,SPELL_RIDE_RED_DRAGON,true);
if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS)))
summoner->CastSpell(me, SPELL_RIDE_RED_DRAGON, true);
if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS)))
{
float victim_threat = malygos->getThreatManager().getThreat(summoner);
malygos->getThreatManager().resetAllAggro();
@@ -1084,7 +1084,7 @@ public:
{
events.Reset();
events.ScheduleEvent(EVENT_YELL_1,0);
events.ScheduleEvent(EVENT_YELL_1, 0);
}
void UpdateAI(const uint32 diff)
@@ -1095,15 +1095,15 @@ public:
{
case EVENT_YELL_1:
Talk(SAY_ONE);
events.ScheduleEvent(EVENT_YELL_2,4*IN_MILLISECONDS);
events.ScheduleEvent(EVENT_YELL_2, 4*IN_MILLISECONDS);
break;
case EVENT_YELL_2:
Talk(SAY_TWO);
events.ScheduleEvent(EVENT_YELL_3,4*IN_MILLISECONDS);
events.ScheduleEvent(EVENT_YELL_3, 4*IN_MILLISECONDS);
break;
case EVENT_YELL_3:
Talk(SAY_THREE);
events.ScheduleEvent(EVENT_YELL_4,7*IN_MILLISECONDS);
events.ScheduleEvent(EVENT_YELL_4, 7*IN_MILLISECONDS);
break;
case EVENT_YELL_4:
Talk(SAY_FOUR);
src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+11 -11
View File
@@ -62,17 +62,17 @@ public:
}
}
SpawnGameObject(GO_FOCUSING_IRIS,focusingIrisPosition);
SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition);
SpawnGameObject(GO_FOCUSING_IRIS, focusingIrisPosition);
SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition);
if (GameObject* platform = instance->GetGameObject(platformGUID))
platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
} else if (state == DONE)
{
if (Creature* malygos = instance->GetCreature(malygosGUID))
malygos->SummonCreature(NPC_ALEXSTRASZA,829.0679f,1244.77f,279.7453f,2.32f);
malygos->SummonCreature(NPC_ALEXSTRASZA, 829.0679f, 1244.77f, 279.7453f, 2.32f);
SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition);
SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition);
// we make the platform appear again because at the moment we don't support looting using a vehicle
if (GameObject* platform = instance->GetGameObject(platformGUID))
@@ -89,9 +89,9 @@ public:
void SpawnGameObject(uint32 entry, Position& pos)
{
GameObject* go = new GameObject;
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),entry, instance,
PHASEMASK_NORMAL, pos.GetPositionX(),pos.GetPositionY(),pos.GetPositionZ(),pos.GetOrientation(),
0,0,0,0,120,GO_STATE_READY))
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, instance,
PHASEMASK_NORMAL, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(),
0, 0, 0, 0, 120, GO_STATE_READY))
{
delete go;
return;
@@ -143,7 +143,7 @@ public:
{
go->Delete(); // this is not the best way.
if (Creature* malygos = instance->GetCreature(malygosGUID))
malygos->GetMotionMaster()->MovePoint(4,770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE
malygos->GetMotionMaster()->MovePoint(4, 770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE
if (GameObject* exitPortal = instance->GetGameObject(exitPortalGUID))
exitPortal->Delete();
@@ -176,7 +176,7 @@ public:
if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4))
continue;
player->CastSpell(trigger,SPELL_VORTEX_4,true);
player->CastSpell(trigger, SPELL_VORTEX_4, true);
counter++;
}
}
@@ -196,7 +196,7 @@ public:
if (Creature* trigger = instance->GetCreature(*itr_trigger))
{
lastPortalGUID = trigger->GetGUID();
trigger->CastSpell(trigger,SPELL_PORTAL_OPENED,true);
trigger->CastSpell(trigger, SPELL_PORTAL_OPENED, true);
return;
}
}
@@ -206,7 +206,7 @@ public:
}
}
void SetData(uint32 data,uint32 /*value*/)
void SetData(uint32 data, uint32 /*value*/)
{
switch (data)
{
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+2 -2
View File
@@ -149,7 +149,7 @@ public:
Phase = 1;
DoScriptText(SAY_SHIELD, me);
DoCast(me, SPELL_RIFT_SHIELD);
Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
if (Rift)
{
//DoCast(Rift, SPELL_CHARGE_RIFT);
@@ -215,7 +215,7 @@ public:
void JustDied(Unit * /*killer*/)
{
if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0))
CAST_AI(boss_anomalus::boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true;
CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true;
}
void UpdateAI(const uint32 diff)
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+2 -2
View File
@@ -82,7 +82,7 @@ public:
void Reset()
{
uiCrystalfireBreathTimer = 14*IN_MILLISECONDS;
uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS);
uiTailSweepTimer = 5*IN_MILLISECONDS;
bEnrage = false;
@@ -214,7 +214,7 @@ public:
DoCast(me, SPELL_CRYSTALIZE);
else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_CRYSTAL_CHAINS);
uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS);
} else uiCrystalChainsCrystalizeTimer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+2 -2
View File
@@ -256,7 +256,7 @@ public:
bFireMagusDead = false;
bFrostMagusDead = false;
bArcaneMagusDead = false;
DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me);
DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me);
return;
}
@@ -273,7 +273,7 @@ public:
bFireMagusDead = false;
bFrostMagusDead = false;
bArcaneMagusDead = false;
DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me);
DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me);
return;
}
src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ public:
std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin();
for (; i != me->getThreatManager().getThreatList().end(); ++i)
{
Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid());
Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid());
if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer)
{
pTarget = pTemp;
src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+9 -9
View File
@@ -75,9 +75,9 @@ public:
{
_Reset();
events.ScheduleEvent(EVENT_MAGIC_PULL,15000);
events.ScheduleEvent(EVENT_STOMP,17000);
events.ScheduleEvent(EVENT_BOMB_SUMMON,2000);
events.ScheduleEvent(EVENT_MAGIC_PULL, 15000);
events.ScheduleEvent(EVENT_STOMP, 17000);
events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000);
postPull = false;
}
@@ -110,21 +110,21 @@ public:
for (uint8 i = 0; i <= (postPull ? 3 : 0); i++)
{
me->GetRandomNearPosition(pPosition, float(urand(0,10)));
me->GetRandomNearPosition(pPosition, float(urand(0, 10)));
me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition);
}
}
events.ScheduleEvent(EVENT_BOMB_SUMMON,2000);
events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000);
break;
case EVENT_MAGIC_PULL:
DoCast(SPELL_MAGIC_PULL);
postPull = true;
events.ScheduleEvent(EVENT_MAGIC_PULL,15000);
events.ScheduleEvent(EVENT_MAGIC_PULL, 15000);
break;
case EVENT_STOMP:
DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me);
DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me);
DoCast(SPELL_THUNDERING_STOMP);
events.ScheduleEvent(EVENT_STOMP,17000);
events.ScheduleEvent(EVENT_STOMP, 17000);
break;
}
}
@@ -144,7 +144,7 @@ public:
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me);
}
private:
bool postPull;
src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+12 -12
View File
@@ -92,7 +92,7 @@ enum AmberDrake
SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated.
// SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target.
//you do not have access to until you kill the Mage-Lord Urom.
SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated.
SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15, 000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated.
};
/*Emerald Drake,
@@ -105,7 +105,7 @@ enum EmeraldDrake
SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346
SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy
SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times.
SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec.
SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25, 000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec.
// you do not have access to until you kill the Mage-Lord Urom
SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels.
};
@@ -145,10 +145,10 @@ public:
if (action != ACTION_SET_NORMAL_EVENTS)
return;
events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
}
void JustSummoned(Creature* summon)
@@ -169,7 +169,7 @@ public:
return;
// TO-DO: See why the spell is not casted
summon->CastSpell(summon,SPELL_PLANAR_BLAST,true);
summon->CastSpell(summon, SPELL_PLANAR_BLAST, true);
}
void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/)
@@ -208,22 +208,22 @@ public:
switch (eventId)
{
case EVENT_ARCANE_BARRAGE:
DoCast(me->getVictim(),SPELL_ARCANE_BARRAGE);
events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE);
events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
break;
case EVENT_ARCANE_VOLLEY:
DoCastAOE(SPELL_ARCANE_VOLLEY);
events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
break;
case EVENT_ENRAGED_ASSAULT:
Talk(SAY_ENRAGE);
DoCast(SPELL_ENRAGED_ASSAULT);
events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
break;
case EVENT_SUMMON_LEY_WHELP:
for (uint8 i = 0; i < 3; i++)
DoCast(SPELL_SUMMON_LEY_WHELP);
events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
break;
}
}
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+23 -23
View File
@@ -78,12 +78,12 @@ static Summons Group[]=
static uint32 TeleportSpells[]=
{
SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3
SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3
};
static int32 SayAggro[]=
{
SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4
SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4
};
class boss_urom : public CreatureScript
@@ -98,7 +98,7 @@ public:
struct boss_uromAI : public BossAI
{
boss_uromAI(Creature* creature) : BossAI(creature,DATA_UROM_EVENT) {}
boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) {}
void Reset()
{
@@ -120,11 +120,11 @@ public:
me->GetMotionMaster()->MoveIdle();
teleportTimer = urand(30000,35000);
teleportTimer = urand(30000, 35000);
arcaneExplosionTimer = 9000;
castArcaneExplosionTimer = 2000;
frostBombTimer = urand(5000,8000);
timeBombTimer = urand(20000,25000);
frostBombTimer = urand(5000, 8000);
timeBombTimer = urand(20000, 25000);
}
void EnterCombat(Unit* /*pWho*/)
@@ -136,7 +136,7 @@ public:
CastTeleport();
if (instance->GetData(DATA_UROM_PLATAFORM) != 3)
instance->SetData(DATA_UROM_PLATAFORM,instance->GetData(DATA_UROM_PLATAFORM)+1);
instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1);
}
void AttackStart(Unit* pWho)
@@ -151,12 +151,12 @@ public:
{
if (me->Attack(pWho, true))
{
DoScriptText(SayAggro[3],me);
DoScriptText(SayAggro[3], me);
me->SetInCombatWith(pWho);
pWho->SetInCombatWith(me);
me->GetMotionMaster()->MoveChase(pWho, 0,0);
me->GetMotionMaster()->MoveChase(pWho, 0, 0);
}
}
}
@@ -169,7 +169,7 @@ public:
while (group[0] == group[1] || group[0] == group[2] || group[1] == group[2])
{
for (uint8 i = 0; i < 3; i++)
group[i] = urand(0,2);
group[i] = urand(0, 2);
}
}
@@ -206,7 +206,7 @@ public:
for (uint8 i = 0; i < 4 ; i++)
{
SetPosition(i);
me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i],x,y,me->GetPositionZ(),me->GetOrientation());
me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i], x, y, me->GetPositionZ(), me->GetOrientation());
}
}
@@ -215,7 +215,7 @@ public:
if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2)
return;
DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)],me);
DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me);
DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]);
}
@@ -231,10 +231,10 @@ public:
if (teleportTimer <= uiDiff)
{
me->InterruptNonMeleeSpells(false);
DoScriptText(SAY_TELEPORT,me);
DoScriptText(SAY_TELEPORT, me);
me->GetMotionMaster()->MoveIdle();
DoCast(SPELL_TELEPORT);
teleportTimer = urand(30000,35000);
teleportTimer = urand(30000, 35000);
} else teleportTimer -= uiDiff;
@@ -256,8 +256,8 @@ public:
Position pPos;
me->getVictim()->GetPosition(&pPos);
me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation());
me->GetMotionMaster()->MoveChase(me->getVictim(),0,0);
me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation());
me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
canCast = false;
@@ -271,15 +271,15 @@ public:
if (frostBombTimer <= uiDiff)
{
DoCastVictim(SPELL_FROSTBOMB);
frostBombTimer = urand(5000,8000);
frostBombTimer = urand(5000, 8000);
} else frostBombTimer -= uiDiff;
if (timeBombTimer <= uiDiff)
{
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM))
DoCast(pUnit,SPELL_TIME_BOMB);
DoCast(pUnit, SPELL_TIME_BOMB);
timeBombTimer = urand(20000,25000);
timeBombTimer = urand(20000, 25000);
} else timeBombTimer -= uiDiff;
}
@@ -303,15 +303,15 @@ public:
switch(pSpell->Id)
{
case SPELL_SUMMON_MENAGERIE:
me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f);
me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f);
LeaveCombat();
break;
case SPELL_SUMMON_MENAGERIE_2:
me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f);
me->SetHomePosition(1164.02f, 1170.85f, 527.321f, 3.66f);
LeaveCombat();
break;
case SPELL_SUMMON_MENAGERIE_3:
me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f);
me->SetHomePosition(1118.31f, 1080.377f, 508.361f, 4.25f);
LeaveCombat();
break;
case SPELL_TELEPORT:
@@ -323,7 +323,7 @@ public:
}
}
private:
float x,y;
float x, y;
bool canCast;
bool canGoBack;
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+20 -20
View File
@@ -65,17 +65,17 @@ public:
boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT)
{
if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE)
DoCast(me,SPELL_CENTRIFUGE_SHIELD);
DoCast(me, SPELL_CENTRIFUGE_SHIELD);
}
void Reset()
{
_Reset();
events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20,25) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20, 25) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
// not sure if this is handled by a timer or hp percentage
events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_CALL_AZURE, urand(15, 30) * IN_MILLISECONDS);
firstCoreEnergize = false;
coreEnergizeOrientation = 0.0f;
@@ -109,7 +109,7 @@ public:
switch (eventId)
{
case EVENT_ENERGIZE_CORES:
DoCast(me,SPELL_ENERGIZE_CORES);
DoCast(me, SPELL_ENERGIZE_CORES);
events.CancelEvent(EVENT_ENERGIZE_CORES);
break;
case EVENT_ENERGIZE_CORES_VISUAL:
@@ -120,20 +120,20 @@ public:
} else
coreEnergizeOrientation = MapManager::NormalizeOrientation(coreEnergizeOrientation - 2.0f);
DoCast(me,SPELL_ENERGIZE_CORES_VISUAL);
DoCast(me, SPELL_ENERGIZE_CORES_VISUAL);
events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4000);
break;
case EVENT_CALL_AZURE:
// not sure how blizz handles this, i cant see any pattern between the differnt spells
DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN);
DoCast(me, SPELL_CALL_AZURE_RING_CAPTAIN);
Talk(SAY_AZURE);
Talk(SAY_AZURE_EMOTE);
events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS);
events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS);
break;
case EVENT_AMPLIFY_MAGIC:
DoCast(me->getVictim(),SPELL_CALL_AMPLIFY_MAGIC);
events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17,20) * IN_MILLISECONDS);
DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC);
events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS);
break;
}
}
@@ -177,7 +177,7 @@ class npc_azure_ring_captain : public CreatureScript
{
if (spell->Id == SPELL_ICE_BEAM)
{
target->CastSpell(target,SPELL_SUMMON_ARCANE_BEAM,true);
target->CastSpell(target, SPELL_SUMMON_ARCANE_BEAM, true);
me->DespawnOrUnsummon();
}
}
@@ -198,8 +198,8 @@ class npc_azure_ring_captain : public CreatureScript
me->GetMotionMaster()->MoveIdle();
if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID))
DoCast(target,SPELL_ICE_BEAM);
if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID))
DoCast(target, SPELL_ICE_BEAM);
}
void DoAction(const int32 action)
@@ -209,13 +209,13 @@ class npc_azure_ring_captain : public CreatureScript
case ACTION_CALL_DRAGON_EVENT:
if (instance)
{
if (Creature* varos = ObjectAccessor::GetCreature(*me,instance->GetData64(DATA_VAROS)))
if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VAROS)))
{
if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0))
{
me->SetReactState(REACT_PASSIVE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT,victim->GetPositionX(),victim->GetPositionY(),victim->GetPositionZ() + 20.0f);
me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT, victim->GetPositionX(), victim->GetPositionY(), victim->GetPositionZ() + 20.0f);
targetGUID = victim->GetGUID();
}
}
@@ -269,7 +269,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader
void Register()
{
OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0,SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -298,14 +298,14 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader
if (varos->GetEntry() != NPC_VAROS)
return;
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation();
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
{
Position pos;
(*itr)->GetPosition(&pos);
float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY());
float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY());
float diff = fabs(orientation - angle);
if (diff > 1.0f)
@@ -345,14 +345,14 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader
if (varos->GetEntry() != NPC_VAROS)
return;
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation();
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
{
Position pos;
(*itr)->GetPosition(&pos);
float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY());
float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY());
float diff = fabs(orientation - angle);
if (diff > 1.0f)
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+10 -10
View File
@@ -61,7 +61,7 @@ public:
if (creature->GetEntry() != NPC_CENTRIFUGE_CONSTRUCT)
return;
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,--centrifugueConstructCounter);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, --centrifugueConstructCounter);
if (!centrifugueConstructCounter)
if (Creature* varos = instance->GetCreature(varosGUID))
@@ -72,12 +72,12 @@ public:
{
if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE)
{
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter);
} else
{
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,0);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0);
player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 0);
}
}
@@ -95,7 +95,7 @@ public:
if (!varos)
return;
if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN,varos->GetPositionX(),varos->GetPositionY(),varos->GetPositionZ()+40))
if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN, varos->GetPositionX(), varos->GetPositionY(), varos->GetPositionZ()+40))
drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT);
}
@@ -117,7 +117,7 @@ public:
break;
case NPC_CENTRIFUGE_CONSTRUCT:
if (creature->isAlive())
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,++centrifugueConstructCounter);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter);
break;
}
}
@@ -145,14 +145,14 @@ public:
case DATA_DRAKOS_EVENT:
if (state == DONE)
{
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter);
OpenCageDoors();
}
break;
case DATA_VAROS_EVENT:
if (state == DONE)
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0);
break;
}
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight"
#define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?"
#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1))
#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE, 1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE, 1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE, 1))
enum Drakes
{