diff options
| author | click <none@none> | 2010-08-08 19:45:53 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-08 19:45:53 +0200 |
| commit | 1f80c7b3c056a791a7f0be52a6e188292d268b82 (patch) | |
| tree | 7a098100fe06b3bffa4869aad2f3dd8225590485 /src/server/scripts/Northrend | |
| parent | 31160bcfce97dc403627f986ca343de6496c8ea8 (diff) | |
Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/Northrend')
18 files changed, 156 insertions, 156 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 7ea4afbcb4b..bfc402e5327 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -65,7 +65,7 @@ enum ACHIEV_TIMED_START_EVENT = 20381, }; -enum Phases +enum Phases { PHASE_MELEE = 0, PHASE_UNDERGROUND = 1, @@ -81,7 +81,7 @@ const Position SpawnPoint[2] = }; const Position SpawnPointGuardian[2] = -{ +{ { 550.348633, 316.006805, 234.2947 }, { 550.188660, 324.264557, 237.7412 }, }; @@ -113,11 +113,11 @@ public: uint32 uiUndergroundTimer; uint32 uiVenomancerTimer; uint32 uiDatterTimer; - + uint32 uiImpaleTimer; uint32 uiImpalePhase; uint64 uiImpaleTarget; - + SummonList lSummons; void Reset() @@ -136,7 +136,7 @@ public: me->RemoveAura(SPELL_SUBMERGE); lSummons.DespawnAll(); - + if (pInstance) { pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); @@ -177,14 +177,14 @@ public: return; switch (uiPhase) - { + { case PHASE_UNDERGROUND: if (uiImpaleTimer <= diff) { switch(uiImpalePhase) - { + { case IMPALE_PHASE_TARGET: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); @@ -288,7 +288,7 @@ public: DoCast(me, SPELL_SUBMERGE, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - + uiPhase = PHASE_UNDERGROUND; ++uiUndergroundPhase; } @@ -305,7 +305,7 @@ public: DoCastVictim(SPELL_CARRION_BEETLES); uiCarrionBeetlesTimer = 25*IN_MILLISECONDS; } else uiCarrionBeetlesTimer -= diff; - + if (uiLeechingSwarmTimer <= diff) { DoCast(me, SPELL_LEECHING_SWARM, true); @@ -326,7 +326,7 @@ public: break; } } - + void JustDied(Unit * /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index bc0d56cceae..d3e477b1b2b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -136,7 +136,7 @@ public: if (data == IN_PROGRESS) for (uint8 i = 0; i < 3; ++i) HandleGameObject(uiAnubarakDoor[i], false); - else if (data == NOT_STARTED || data == DONE) + else if (data == NOT_STARTED || data == DONE) for (uint8 i = 0; i < 3; ++i) HandleGameObject(uiAnubarakDoor[i], true); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 5ed714e897e..b18b0e01250 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_QUIVERING_STRIKE = 72422, SPELL_IMPENDING_DESPAIR = 72426, SPELL_DEFILING_HORROR = 72435, - SPELL_HOPELESSNESS = 72395, + SPELL_HOPELESSNESS = 72395, H_SPELL_HOPELESSNESS = 72390, // TODO: not in dbc. Add in DB. }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 89c47a344ed..47e7c7270b4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -71,7 +71,7 @@ enum Yells enum Events { EVENT_NONE, - + EVENT_START_INTRO, EVENT_SKIP_INTRO, @@ -133,7 +133,7 @@ enum eEnum QUEST_DELIVRANCE_FROM_THE_PIT_H2 = 24712, QUEST_WRATH_OF_THE_LICH_KING_A2 = 24500, QUEST_WRATH_OF_THE_LICH_KING_H2 = 24802, -}; +}; static Position HallsofReflectionLocs[]= { @@ -201,7 +201,7 @@ public: // AI of Part1: handle the intro till start of gauntlet event. struct npc_jaina_or_sylvanas_horAI : public ScriptedAI { - npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) + npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) { pInstance = me->GetInstanceScript(); } @@ -224,7 +224,7 @@ public: me->SetVisibility(VISIBILITY_ON); } - void DoAction(const int32 actionId) + void DoAction(const int32 actionId) { switch(actionId) { @@ -276,7 +276,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_5, 2000); break; case EVENT_INTRO_A2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_1, pUther); events.ScheduleEvent(EVENT_INTRO_A2_6, 3000); break; @@ -285,7 +285,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_7, 6000); break; case EVENT_INTRO_A2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_2, pUther); events.ScheduleEvent(EVENT_INTRO_A2_8, 6500); break; @@ -294,7 +294,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_9, 2000); break; case EVENT_INTRO_A2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_3, pUther); events.ScheduleEvent(EVENT_INTRO_A2_10, 9000); break; @@ -303,7 +303,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_11, 5000); break; case EVENT_INTRO_A2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_4, pUther); events.ScheduleEvent(EVENT_INTRO_A2_12, 11000); break; @@ -312,7 +312,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_13, 4000); break; case EVENT_INTRO_A2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_5, pUther); events.ScheduleEvent(EVENT_INTRO_A2_14, 12500); break; @@ -321,12 +321,12 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_15, 10000); break; case EVENT_INTRO_A2_15: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_6, pUther); events.ScheduleEvent(EVENT_INTRO_A2_16, 22000); break; case EVENT_INTRO_A2_16: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_7, pUther); events.ScheduleEvent(EVENT_INTRO_A2_17, 4000); break; @@ -335,7 +335,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_18, 2000); break; case EVENT_INTRO_A2_18: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) { pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); DoScriptText(SAY_UTHER_INTRO_A2_8, pUther); @@ -372,7 +372,7 @@ public: events.ScheduleEvent(EVENT_INTRO_H2_5, 2000); break; case EVENT_INTRO_H2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_H2_1, pUther); events.ScheduleEvent(EVENT_INTRO_H2_6, 11000); break; @@ -381,7 +381,7 @@ public: events.ScheduleEvent(EVENT_INTRO_H2_7, 3000); break; case EVENT_INTRO_H2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_H2_2, pUther); events.ScheduleEvent(EVENT_INTRO_H2_8, 6000); break; @@ -424,7 +424,7 @@ public: DoScriptText(SAY_SYLVANAS_INTRO_8, me); events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); break; - + // Remaining Intro Events common for both faction case EVENT_INTRO_LK_1: // Spawn LK in front of door, and make him move to the sword. @@ -451,40 +451,40 @@ public: break; case EVENT_INTRO_LK_3: - // The Lich King banishes Uther to the abyss. + // The Lich King banishes Uther to the abyss. if (Creature* pUther = me->GetCreature(*me, uiUther)) { pUther->DisappearAndDie(); uiUther = 0; } - - // He steps forward and removes the runeblade from the heap of skulls. - + + // He steps forward and removes the runeblade from the heap of skulls. + events.ScheduleEvent(EVENT_INTRO_LK_4, 4000); break; - + case EVENT_INTRO_LK_4: if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) DoScriptText(SAY_LK_INTRO_2, pLichKing); events.ScheduleEvent(EVENT_INTRO_LK_5, 10000); break; - + case EVENT_INTRO_LK_5: // summon Falric and Marwyn. then go back to the door if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) pFalric->SetVisibility(VISIBILITY_ON); if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) pMarwyn->SetVisibility(VISIBILITY_ON); - + if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) { pLichKing->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); DoScriptText(SAY_LK_INTRO_3, pLichKing); } - + events.ScheduleEvent(EVENT_INTRO_LK_6, 8000); break; - + case EVENT_INTRO_LK_6: if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_1, pFalric); @@ -498,7 +498,7 @@ public: events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); break; - + case EVENT_INTRO_LK_8: if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_2, pFalric); @@ -516,7 +516,7 @@ public: // TODO: Loralen/Koreln shall run also events.ScheduleEvent(EVENT_INTRO_END, 10000); break; - + case EVENT_INTRO_END: if (pInstance) pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 29fc462b15b..df54e58c574 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -83,11 +83,11 @@ struct boss_horAI : ScriptedAI { pInstance = me->GetInstanceScript(); } - + InstanceScript* pInstance; EventMap events; SummonList summons; - + void Reset() { events.Reset(); @@ -121,11 +121,11 @@ struct boss_horAI : ScriptedAI break; } } - + void JustSummoned(Creature *pSummoned) { summons.Summon(pSummoned); - + if (Unit *pUnit = pSummoned->SelectNearestTarget()) { if (pSummoned->AI()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 5d1626ec3d1..bd5f551cffd 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -27,7 +27,7 @@ EndScriptData */ enum Spells { - + SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. SPELL_EMPOWERED_ARCANE_EXPLOSION = 51110, SPELL_EMPOWERED_ARCANE_EXPLOSION_2 = 59377, @@ -58,7 +58,7 @@ enum eCreature NPC_PHANTASMAL_AIR = 27650, NPC_PHANTASMAL_FIRE = 27651, NPC_PHANTASMAL_WATER = 27653, - + NPC_PHANTASMAL_MURLOC = 27649, NPC_PHANTASMAL_NAGAL = 27648, NPC_PHANTASMAL_OGRE = 27647 @@ -176,7 +176,7 @@ public: pWho->SetInCombatWith(me); me->GetMotionMaster()->MoveChase(pWho, 0,0); - } + } } } @@ -190,7 +190,7 @@ public: uiGroup[0] = urand(0,2); uiGroup[1] = urand(0,2); uiGroup[2] = urand(0,2); - } + } } void SetPosition(uint8 uiI) @@ -247,7 +247,7 @@ public: if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) < 2) return; - + if (uiTeleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); @@ -291,7 +291,7 @@ public: if (uiFrostBombTimer <= uiDiff) { DoCastVictim(SPELL_FROSTBOMB); - uiFrostBombTimer = urand(5000,8000); + uiFrostBombTimer = urand(5000,8000); } else uiFrostBombTimer -= uiDiff; if (uiTimeBombTimer <= uiDiff) @@ -342,7 +342,7 @@ public: break; case SPELL_TELEPORT: me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting - bCanCast = true; + bCanCast = true; break; default: break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 8f023a98968..0417c7071c9 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -83,7 +83,7 @@ public: pGO->SetGoState(GO_STATE_ACTIVE); else pGO->SetGoState(GO_STATE_READY); - + GameObjectList.push_back(pGO->GetGUID()); } } @@ -141,7 +141,7 @@ public: return 0; } - + void OpenCageDoors() { if (GameObjectList.empty()) diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index 6dc24313584..29a3bac2bdb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -115,7 +115,7 @@ enum eEnums SPELL_FLAME_TSUNAMI_DMG_AURA = 57491, // periodic damage, npc has this aura SPELL_FLAME_TSUNAMI_BUFF = 60430, - + NPC_FLAME_TSUNAMI = 30616, // for the flame waves NPC_LAVA_BLAZE = 30643, // adds spawning from flame strike @@ -398,7 +398,7 @@ public: pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); } - + pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); } } @@ -860,7 +860,7 @@ struct dummy_dragonAI : public ScriptedAI case NPC_TENEBRON: { iTextId = WHISPER_HATCH_EGGS; - if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for(uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); @@ -1273,7 +1273,7 @@ public: else { OpenPortal(); - DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); + DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); m_uiAcolyteVesperonTimer = urand(60000,70000); } } @@ -1324,7 +1324,7 @@ public: InstanceScript* pInstance; uint32 uiDespawnTimer; - + void Reset() { uiDespawnTimer = 28000; @@ -1361,7 +1361,7 @@ public: if (map->IsDungeon()) { Map::PlayerList const &PlayerList = map->GetPlayers(); - + if (PlayerList.isEmpty()) return; @@ -1437,14 +1437,14 @@ public: uiDespawnTimer = 28000; if (pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); } DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } void JustDied(Unit* pKiller) { - me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); + me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); // remove twilight torment on Vesperon if (pInstance) @@ -1455,7 +1455,7 @@ public: if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); - + Map *map = me->GetMap(); if (map->IsDungeon()) { @@ -1520,7 +1520,7 @@ public: struct mob_twilight_eggsAI : public Scripted_NoMovementAI { mob_twilight_eggsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) - { + { pInstance = pCreature->GetInstanceScript(); } @@ -1538,23 +1538,23 @@ public: m_uiFadeArmorTimer = 1000; m_uiHatchEggTimer = 20000; } - + void SpawnWhelps() { me->RemoveAllAuras(); if (!pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) me->SummonCreature(NPC_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); - else + else me->SummonCreature(NPC_SHARTHARION_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); me->DealDamage(me, me->GetHealth()); } - + void JustSummoned(Creature* pWho) { pWho->SetInCombatWithZone(); } - + void UpdateAI(const uint32 uiDiff) { if (m_uiHatchEggTimer <= uiDiff) @@ -1565,9 +1565,9 @@ public: SpawnWhelps(); } else - m_uiHatchEggTimer -= uiDiff; + m_uiHatchEggTimer -= uiDiff; } - + void AttackStart(Unit* pWho) {} void MoveInLineOfSight(Unit* pWho) {} @@ -1608,7 +1608,7 @@ public: TsunamiBuff_timer = 1000; entry = 0; } - + void UpdateAI(const uint32 diff) { if (Tsunami_Timer <= diff) @@ -1616,7 +1616,7 @@ public: DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA); Tsunami_Timer = 500; }else Tsunami_Timer -= diff; - + if(TsunamiBuff_timer <= diff) { if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true)) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index c503f909d52..0278b8f9ca3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -689,7 +689,7 @@ public: } void UpdateAI(const uint32 diff) - { + { } };
}; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index d436d96d15f..0e8c1d40f2f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -72,7 +72,7 @@ public: uint64 uiFreyaChestGUID; void Initialize() - { + { uiIgnisGUID = 0; uiRazorscaleGUID = 0; uiXT002GUID = 0; @@ -113,7 +113,7 @@ public: switch(pCreature->GetEntry()) { case NPC_LEVIATHAN: - uiLeviathanGUID = pCreature->GetGUID(); + uiLeviathanGUID = pCreature->GetGUID(); break; case NPC_IGNIS: uiIgnisGUID = pCreature->GetGUID(); @@ -194,10 +194,10 @@ public: if (flag == 7) flag =0; break; - case GO_LEVIATHAN_GATE: + case GO_LEVIATHAN_GATE: uiLeviathanGateGUID = add ? pGO->GetGUID() : NULL; - HandleGameObject(NULL, false, pGO); - break; + HandleGameObject(NULL, false, pGO); + break; } } @@ -211,7 +211,7 @@ public: { case EVENT_TOWER_OF_STORM_DESTROYED: //pGO->GetInstanceScript()->SetData(DATA_TOWER_STORMS,DESTROYED); - pFlameLeviathan->AI()->DoAction(1); + pFlameLeviathan->AI()->DoAction(1); break; case EVENT_TOWER_OF_FROST_DESTROYED: pFlameLeviathan->AI()->DoAction(2); @@ -277,9 +277,9 @@ public: if (Creature* pBoss = instance->GetCreature(uiLeviathanGUID)) pBoss->AI()->DoAction(10); if (GameObject* pGate = instance->GetGameObject(uiLeviathanGateGUID)) - pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); + pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); } - break; + break; default: break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index a6d1271ce0e..df3f4375bc1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -42,7 +42,7 @@ enum eTypes DATA_MOLGEIM = 21, DATA_BRUNDIR = 22, DATA_RUNEMASTER_MOLGEIM = 23, - DATA_STORMCALLER_BRUNDIR = 24, + DATA_STORMCALLER_BRUNDIR = 24, NPC_LEVIATHAN = 33113, NPC_IGNIS = 33118, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 368b769885f..33e1ff74381 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -268,7 +268,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned->GetEntry() == CREATURE_GRAUF) m_uiGraufGUID = 0; @@ -310,7 +310,7 @@ public: case FLYING: if (!UpdateVictim()) return; - + if (me->GetPositionX() >= 519) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); @@ -325,14 +325,14 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); m_bSaidEmote = false; } - + if (m_uiMountTimer && m_uiMountTimer <= diff) { me->Mount(DATA_MOUNT); me->SetFlying(true); m_uiMountTimer = 0; } else m_uiMountTimer -= diff; - + if (m_uiSummonTimer <= diff) { SpawnMobs(); @@ -343,35 +343,35 @@ public: { switch(m_uiWaypointId) { - case 0: - me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); + case 0: + me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); m_uiMovementTimer = 5000; break; - case 1: + case 1: me->GetMotionMaster()->MovePoint(0, Location[2].GetPositionX(), Location[2].GetPositionY(), Location[2].GetPositionZ()); m_uiMovementTimer = 2000; break; - case 2: + case 2: me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); m_uiMovementTimer = 15000; break; case 3: - me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); DoScriptText(EMOTE_BREATH, me); m_uiMovementTimer = 2500; break; case 4: - me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); m_uiMovementTimer = 2000; SpawnTrigger(); break; case 5: - me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); m_uiMovementTimer = 3000; break; case 6: - me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); m_uiWaypointId = 2; m_uiMovementTimer = 15000; break; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c0e7cfdbb88..d54dded37c3 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -193,7 +193,7 @@ public: uiSaboteurPortal = 0; trashMobs.clear(); - + uiRemoveNpc = 0; uiDoorIntegrity = 100; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 59547c7ca5c..215a4f3d6d2 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -474,12 +474,12 @@ public: break; } } - + void UpdateAI(const uint32 diff) { if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS)) me->CastStop(); - + npc_escortAI::UpdateAI(diff); if(!bHasGotMovingPoints) @@ -557,7 +557,7 @@ public: uint32 uiSpawnTimer; bool bPortalGuardianOrKeeperOrEliteSpawn; uint8 uiTypeOfMobsPortal; - + SummonList listOfMobs; InstanceScript *pInstance; @@ -569,14 +569,14 @@ public: } void EnterCombat(Unit * /*who*/) {} - + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { if (!pInstance) //Massive usage of pInstance, global check return; - + if (pInstance->GetData(DATA_REMOVE_NPC) == 1) { me->ForcedDespawn(); diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 2b849cc3d12..4cc68b4585c 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -74,7 +74,7 @@ public: enum eInquisitor -{ +{ NPC_GODFREY = 27577, SPELL_HOLY_FIRE = 39323, @@ -116,7 +116,7 @@ public: npc_inquisitor_hallard() : CreatureScript("npc_inquisitor_hallard") { } struct npc_inquisitor_hallardAI : public npc_escortAI - { + { npc_inquisitor_hallardAI(Creature* pCreature) : npc_escortAI(pCreature) { } bool Completed; @@ -128,22 +128,22 @@ public: return; Creature* Godfrey = me->FindNearestCreature(NPC_GODFREY, 50, true); if (!Godfrey) - return; + return; switch (i) { - case 1: + case 1: DoScriptText(SAY_WP_1, me, Godfrey); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); me->HandleEmoteCommand(5); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); break; case 2: Godfrey->HandleEmoteCommand(434); DoScriptText(SAY_WP_2, me, Godfrey); me->HandleEmoteCommand(15); break; - case 3: + case 3: DoScriptText(SAY_WP_3, me, Godfrey); me->HandleEmoteCommand(1); break; @@ -165,7 +165,7 @@ public: me->HandleEmoteCommand(16); break; case 9: - DoScriptText(SAY_WP_9, me, Godfrey); + DoScriptText(SAY_WP_9, me, Godfrey); me->HandleEmoteCommand(5); break; case 10: @@ -229,33 +229,33 @@ public: case 27: DoScriptText(SAY_WP_27, me, Godfrey); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); - Completed = true; + Completed = true; if (pPlayer) pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, me); - break; + break; } } void Reset() - { + { Completed = false; - } + } void UpdateAI(const uint32 diff) - { - npc_escortAI::UpdateAI(diff); + { + npc_escortAI::UpdateAI(diff); } }; bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_A_RIGHTEOUS_SERMON) - { + { DoScriptText(SAY_WP_0, pCreature, pPlayer); if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallard::npc_inquisitor_hallardAI, pCreature->AI())) { pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true); - pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); + pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); } } return true; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index fcf0775f0c8..9d91f7c14c4 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -576,12 +576,12 @@ public: struct npc_wounded_skirmisherAI : public ScriptedAI { npc_wounded_skirmisherAI(Creature *c) : ScriptedAI(c) {} - + uint64 uiPlayerGUID; uint32 DespawnTimer; - void Reset () + void Reset () { DespawnTimer = 5000; uiPlayerGUID = 0; @@ -594,23 +594,23 @@ public: } void SpellHit(Unit *caster, const SpellEntry *spell) - { + { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) - { + { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); DoScriptText(RAND(RANDOM_SAY_1,RANDOM_SAY_2,RANDOM_SAY_3),caster); - if(me->IsStandState()) - me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); + if(me->IsStandState()) + me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else { me->SetStandState(UNIT_STAND_STATE_STAND); - me->ForcedDespawn(DespawnTimer); + me->ForcedDespawn(DespawnTimer); } - + } } - + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index cd175d20797..a77063669cc 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -329,8 +329,8 @@ public: enum eEnums { SPELL_EXPLODE_CRYSTAL = 62487, - SPELL_FLAMES = 64561, - + SPELL_FLAMES = 64561, + SAY_WP_7 = -1800047, SAY_WP_6 = -1800048, SAY_WP_5 = -1800049, @@ -350,38 +350,38 @@ public: struct npc_engineer_heliceAI : public npc_escortAI { npc_engineer_heliceAI(Creature* pCreature) : npc_escortAI(pCreature) { } - - uint32 m_uiChatTimer; + + uint32 m_uiChatTimer; void WaypointReached(uint32 i) - { + { Player* pPlayer = GetPlayerForEscort(); switch (i) { case 0: DoScriptText(SAY_WP_2, me); break; - case 1: + case 1: DoScriptText(SAY_WP_3, me); me->CastSpell(5918.33, 5372.91, -98.770, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; - case 2: + case 2: DoScriptText(SAY_WP_4, me); break; case 7: DoScriptText(SAY_WP_5, me); break; - case 8: + case 8: me->CastSpell(5887.37, 5379.39, -91.289, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; - case 9: + case 9: DoScriptText(SAY_WP_6, me); break; - case 13: + case 13: if (pPlayer) { pPlayer->GroupEventHappens(QUEST_DISASTER, me); @@ -389,20 +389,20 @@ public: } break; } - } + } void Reset() - { - m_uiChatTimer = 4000; + { + m_uiChatTimer = 4000; } void JustDied(Unit* /*pKiller*/) { Player* pPlayer = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING)) { - if (pPlayer) - pPlayer->FailQuest(QUEST_DISASTER); - } + if (pPlayer) + pPlayer->FailQuest(QUEST_DISASTER); + } } void UpdateAI(const uint32 uiDiff) @@ -412,12 +412,12 @@ public: if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (m_uiChatTimer <= uiDiff) - { + { m_uiChatTimer = 12000; } else m_uiChatTimer -= uiDiff; - } + } } }; @@ -428,10 +428,10 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) { - if (pQuest->GetQuestId() == QUEST_DISASTER) + if (pQuest->GetQuestId() == QUEST_DISASTER) { if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, pCreature->AI())) - { + { pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4, 0.4); pCreature->setFaction(113); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 8d9cccd473c..9af209179a0 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -240,7 +240,7 @@ enum eGurgthock QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1 = 12932, QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR = 12933, QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND = 12934, - + NPC_ORINOKO_TUSKBREAKER = 30020, NPC_KORRAK_BLOODRAGER = 30023, NPC_YGGDRAS = 30014, @@ -480,7 +480,7 @@ public: } break; case 10: - me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); + me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); DoScriptText(EMOTE_YGGDRAS_SPAWN,me); uiPhase = 0; break; @@ -511,7 +511,7 @@ public: pCreature->AI()->SetData(1,uiBossRandom); uiPhase = 0; break; - } + } }else uiTimer -= uiDiff; } } @@ -965,7 +965,7 @@ public: } } } - + if (bThunderClap && me->GetHealth()*100 / me->GetMaxHealth() <= 10) { DoCastAOE(SPELL_THUNDERCLAP); @@ -1057,7 +1057,7 @@ public: } void SummonAdds() - { + { if (!Boss[uiBossRandom].uiAdd) return; @@ -1071,7 +1071,7 @@ public: SummonList.push_back(pSummon->GetGUID()); } } - + } void EnterCombat(Unit* pUnit) @@ -1082,7 +1082,7 @@ public: if (Creature* pTemp = Unit::GetCreature(*me, *itr)) { pTemp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :( - pTemp->AI()->AttackStart(pUnit); + pTemp->AI()->AttackStart(pUnit); } } } @@ -1109,7 +1109,7 @@ public: } } } - + if (uiElementalSpellTimer <= uiDiff) { DoCastVictim(Boss[uiBossRandom].uiSpell); @@ -1131,7 +1131,7 @@ public: pTemp->GetMotionMaster()->MoveChase(pTemp->getVictim()); } } - + bAddAttack = true; } @@ -1192,10 +1192,10 @@ public: { if (!pWho) return; - + AttackStartNoMove(pWho); } - + void SetData(uint32 uiData, uint32 uiValue) { if (uiData == 1) @@ -1207,7 +1207,7 @@ public: { if (!UpdateVictim()) return; - + if (me->GetPositionZ() >= 287.0f) if (uiMissleTimer <= uiDiff) { |
