diff options
| author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
| commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
| tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/scripts | |
| parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
| parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/scripts')
286 files changed, 4850 insertions, 1312 deletions
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 6db414555da..1b3454e5ae6 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -104,7 +104,7 @@ public: std::string password = szPassword; AccountOpResult result = AccountMgr::CreateAccount(account_name, password); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); @@ -165,7 +165,7 @@ public: return false; AccountOpResult result = AccountMgr::DeleteAccount(account_id); - switch(result) + switch (result) { case AOR_OK: handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); @@ -299,7 +299,7 @@ public: } AccountOpResult result = AccountMgr::ChangePassword(handler->GetSession()->GetAccountId(), std::string(new_pass)); - switch(result) + switch (result) { case AOR_OK: handler->SendSysMessage(LANG_COMMAND_PASSWORD); diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 1848e22121c..dca2f1e4f0e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -291,7 +291,7 @@ public: else if (commentToken[1] == '/') { std::string str; - getline(ifs,str); + getline(ifs, str); continue; } // regular data @@ -558,7 +558,7 @@ public: uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0); std::string st; - switch(item->GetState()) + switch (item->GetState()) { case ITEM_UNCHANGED: st = "unchanged"; break; case ITEM_CHANGED: st = "changed"; break; @@ -1061,13 +1061,13 @@ public: if (isint32) { uint32 iValue = (uint32)atoi(py); - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { float fValue = (float)atof(py); - target->SetFloatValue(Opcode , fValue); + target->SetFloatValue(Opcode, fValue); handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } @@ -1143,7 +1143,7 @@ public: int CurrentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(Opcode); CurrentValue += Value; - handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode , (uint32)CurrentValue); + handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode, (uint32)CurrentValue); handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); @@ -1225,7 +1225,7 @@ public: return false; uint32 iValue = Value ? 1 << (Value - 1) : 0; - target->SetUInt32Value(Opcode , iValue); + target->SetUInt32Value(Opcode, iValue); handler->PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue); return true; diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 9ffd366544e..118ab9eb13a 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -498,18 +498,18 @@ public: float z; float ort; uint32 mapid; - + if (pmapid) mapid = (uint32)atoi(pmapid); else mapid = _player->GetMapId(); - - if( port ) + + if ( port ) ort = (float)atof(port); else ort = _player->GetOrientation(); - - if( pz ) + + if ( pz ) { z = (float)atof(pz); if (!MapManager::IsValidMapCoord(mapid, x, y, z)) @@ -530,7 +530,7 @@ public: Map const* map = sMapMgr->CreateBaseMap(mapid); z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y)); } - + // stop flight if need if (_player->isInFlight()) { diff --git a/src/server/scripts/Commands/cs_gps.cpp b/src/server/scripts/Commands/cs_gps.cpp index 57b11630a85..2a270527fb8 100644 --- a/src/server/scripts/Commands/cs_gps.cpp +++ b/src/server/scripts/Commands/cs_gps.cpp @@ -129,7 +129,7 @@ public: { Player* player = handler->GetSession()->GetPlayer(); - sLog->outSQLDev("(@PATH,XX,%.3f,%.3f,%.5f,0,0,0,100,0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + sLog->outSQLDev("(@PATH, XX, %.3f, %.3f, %.5f, 0,0, 0,100, 0),", player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); handler->PSendSysMessage("Waypoint SQL written to SQL Developer log"); return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index fe4dc2af1e2..7c08fe4d297 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -27,7 +27,7 @@ public: {
static ChatCommand commandTable[] =
{
- { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
+ { "dev", SEC_ADMINISTRATOR, false, &HandleDevCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
return commandTable;
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 1951b6cd361..28bc17a7450 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -441,12 +441,12 @@ public: else if (target->ToCreature()->isPet()) { Unit* owner = target->GetOwner(); - if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet* )target)->IsPermanentPetFor(owner->ToPlayer())) + if (owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet*)target)->IsPermanentPetFor(owner->ToPlayer())) { // check online security if (handler->HasLowerSecurity(owner->ToPlayer(), 0)) return false; - ((Pet* )target)->SetFreeTalentPoints(tp); + ((Pet*)target)->SetFreeTalentPoints(tp); owner->ToPlayer()->SendTalentsInfoData(true); return true; } @@ -725,7 +725,7 @@ public: uint32 num = 0; num = atoi((char*)args); - switch(num) + switch (num) { case 1: mId=14340; @@ -1282,7 +1282,7 @@ public: return false; uint32 anim_id = atoi((char*)args); - handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE , anim_id); + handler->GetSession()->GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE, anim_id); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index b91f85ec1b6..cdb87fde354 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -952,7 +952,7 @@ public: // make some emotes char lastchar = args[strlen(args) - 1]; - switch(lastchar) + switch (lastchar) { case '?': creature->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION); break; case '!': creature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; @@ -1272,7 +1272,7 @@ public: bool added = false; if (tmpItem) { - switch(SlotID) + switch (SlotID) { case 1: creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY, ItemID); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5e08a1b0611..a616588367c 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -77,7 +77,7 @@ public: // check item starting quest (it can work incorrectly if added without item in inventory) ItemTemplateContainer const* itc = sObjectMgr->GetItemTemplateStore(); - ItemTemplateContainer::const_iterator result = find_if(itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); + ItemTemplateContainer::const_iterator result = find_if (itc->begin(), itc->end(), Finder<uint32, ItemTemplate>(entry, &ItemTemplate::StartQuest)); if (result != itc->end()) { diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 4e7a2794f58..7784d495f80 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -226,7 +226,7 @@ public: static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) { - if(*args != 'a') // will be reloaded from all_gossips + if (*args != 'a') // will be reloaded from all_gossips HandleReloadNpcTrainerCommand(handler, "a"); HandleReloadNpcVendorCommand(handler, "a"); HandleReloadPointsOfInterestCommand(handler, "a"); @@ -298,7 +298,7 @@ public: { HandleReloadGossipMenuCommand(handler, "a"); HandleReloadGossipMenuOptionCommand(handler, "a"); - if(*args != 'a') // already reload from all_scripts + if (*args != 'a') // already reload from all_scripts HandleReloadPointsOfInterestCommand(handler, "a"); return true; } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index dea747b97b8..e3295a6c45e 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -92,7 +92,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript { if (!bHasAura) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_NORTH_MARSHAL: DoCast(me, SPELL_NORTH_MARSHAL); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index d9d8627403a..39ddbc2f6fc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -106,7 +106,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (InstanceScript* pInstance = player->GetInstanceScript()) { @@ -211,7 +211,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0: DoScriptText(SCRIPT_TEXT1, me);//2 @@ -297,7 +297,7 @@ public: { if (Event_Timer <= diff) { - switch(EventPhase) + switch (EventPhase) { case 0: DoScriptText(SCRIPT_TEXT5, me);//1 @@ -662,7 +662,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; @@ -785,7 +785,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 1: me->Say(SAY_WINDSOR_1, LANG_UNIVERSAL, PlayerGUID); @@ -822,7 +822,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN , 0); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR, 403.61f, -51.71f, -63.92f, 3.600434f, TEMPSUMMON_DEAD_DESPAWN, 0); pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -959,7 +959,7 @@ public: void WaypointReached(uint32 i) { wp=i; - switch(i) + switch (i) { case 0: me->setFaction(11); @@ -1166,7 +1166,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 2: @@ -1293,7 +1293,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 1: me->HandleEmoteCommand(EMOTE_ONESHOT_KICK); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index f6fa3ca18d9..94181105be4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -162,7 +162,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; @@ -184,7 +184,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; @@ -220,7 +220,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data); - switch(type) + switch (type) { case DATA_EVENSTARTER: TombEventStarterGUID = data; @@ -236,7 +236,7 @@ public: { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); - switch(type) + switch (type) { case TYPE_RING_OF_LAW: m_auiEncounter[0] = data; @@ -281,7 +281,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_RING_OF_LAW: return m_auiEncounter[0]; @@ -306,7 +306,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_EMPEROR: return EmperorGUID; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h index 72f4fb707c8..b330e80a294 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h @@ -27,7 +27,7 @@ enum Data DATA_UROK_DOOMHOWL, // not scripted DATA_QUARTERMASTER_ZIGRIS, DATA_GIZRUL_THE_SLAVENER, // not scripted - DATA_HALYCON , + DATA_HALYCON, DATA_OVERLORD_WYRMTHALAK, DATA_PYROGAURD_EMBERSEER, DATA_WARCHIEF_REND_BLACKHAND, diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index 415f3796d52..d65c1c68090 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -81,7 +81,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_OMOKK: HighlordOmokk = creature->GetGUID(); @@ -130,7 +130,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_WHELP_SPAWNER: go->CastSpell(NULL, SPELL_SUMMON_ROOKERY_WHELP); @@ -169,7 +169,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_OMOKK: return HighlordOmokk; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index d74c075b05a..0a8a4a88191 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -244,22 +244,22 @@ public: std::list<HostileReference*> threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) { - Unit* pUnit; + Unit* unit; if ((*i) && (*i)->getSource()) { - pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit) + unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit) { //Cast affliction - DoCast(pUnit, RAND(SPELL_BROODAF_BLUE, SPELL_BROODAF_BLACK, + DoCast(unit, RAND(SPELL_BROODAF_BLUE, SPELL_BROODAF_BLACK, SPELL_BROODAF_RED, SPELL_BROODAF_BRONZE, SPELL_BROODAF_GREEN), true); //Chromatic mutation if target is effected by all afflictions - if (pUnit->HasAura(SPELL_BROODAF_BLUE) - && pUnit->HasAura(SPELL_BROODAF_BLACK) - && pUnit->HasAura(SPELL_BROODAF_RED) - && pUnit->HasAura(SPELL_BROODAF_BRONZE) - && pUnit->HasAura(SPELL_BROODAF_GREEN)) + if (unit->HasAura(SPELL_BROODAF_BLUE) + && unit->HasAura(SPELL_BROODAF_BLACK) + && unit->HasAura(SPELL_BROODAF_RED) + && unit->HasAura(SPELL_BROODAF_BRONZE) + && unit->HasAura(SPELL_BROODAF_GREEN)) { //pTarget->RemoveAllAuras(); //DoCast(target, SPELL_CHROMATIC_MUT_1); @@ -269,8 +269,8 @@ public: //So instead we instant kill our target //WORKAROUND - if (pUnit->GetTypeId() == TYPEID_PLAYER) - pUnit->CastSpell(pUnit, 5, false); + if (unit->GetTypeId() == TYPEID_PLAYER) + unit->CastSpell(unit, 5, false); } } } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 53985ce9e58..7903bee11a7 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -98,7 +98,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(7134, creature->GetGUID()); return true; } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index cbb4917de2e..929e201d71c 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -138,7 +138,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->HandleEmoteCommand(EMOTE_STATE_KNEEL); //dosen't work? diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 370bcfe13b9..2d626a64895 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -186,7 +186,7 @@ class instance_deadmines : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FACTORY_DOOR: FactoryDoorGUID = go->GetGUID(); break; case GO_IRONCLAD_DOOR: IronCladDoorGUID = go->GetGUID(); break; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index f18fc5ee243..364dd8532db 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -273,7 +273,7 @@ public: if (me->getFaction() != GetPlayerForEscort()->getFaction()) me->setFaction(GetPlayerForEscort()->getFaction()); - switch(uiPoint) + switch (uiPoint) { case 3: SetEscortPaused(true); @@ -312,7 +312,7 @@ public: void SetData(uint32 uiI, uint32 uiValue) { - switch(uiI) + switch (uiI) { case 1: SetEscortPaused(true); @@ -323,7 +323,7 @@ public: if (!pInstance) return; - switch(uiValue) + switch (uiValue) { case 1: pInstance->SetData(TYPE_EVENT, IN_PROGRESS); @@ -339,7 +339,7 @@ public: void Summon(uint8 uiCase) { - switch(uiCase) + switch (uiCase) { case 1: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); @@ -417,7 +417,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_BLASTMASTER_1, me); diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 8b42c7135e5..d0642d3a24d 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -77,7 +77,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BLASTMASTER_EMI_SHORTFUSE: uiBastmasterEmiShortfuseGUID = creature->GetGUID(); break; } @@ -85,7 +85,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_CAVE_IN_LEFT: uiCaveInLeftGUID = go->GetGUID(); @@ -102,7 +102,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_EVENT: return m_auiEncounter[0]; } @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GO_CAVE_IN_LEFT: return uiCaveInLeftGUID; case DATA_GO_CAVE_IN_RIGHT: return uiCaveInRightGUID; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 92c2d417cda..e804d2b2b61 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -43,7 +43,7 @@ EndScriptData */ #define MOUNTED_DISPLAYID 16040 -//Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us) +//Attumen (TODO: Use the summoning spell instead of Creature id. It works, but is not convenient for us) #define SUMMON_ATTUMEN 15550 class boss_attumen : public CreatureScript @@ -141,8 +141,8 @@ public: { if (Phase == 2) { - if (Unit* pUnit = Unit::GetUnit(*me, Attumen)) - DoScriptText(SAY_MIDNIGHT_KILL, pUnit); + if (Unit* unit = Unit::GetUnit(*me, Attumen)) + DoScriptText(SAY_MIDNIGHT_KILL, unit); } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 04981669681..98e40acc4e1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -359,9 +359,9 @@ struct boss_moroes_guestAI : public ScriptedAI uint64 TempGUID = GuestGUID[rand()%4]; if (TempGUID) { - Unit* pUnit = Unit::GetUnit((*me), TempGUID); - if (pUnit && pUnit->isAlive()) - return pUnit; + Unit* unit = Unit::GetUnit((*me), TempGUID); + if (unit && unit->isAlive()) + return unit; } return me; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index d25d3518b9e..40d984d70a3 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -108,7 +108,7 @@ public: struct netherspite_infernalAI : public ScriptedAI { - netherspite_infernalAI(Creature* c) : ScriptedAI(c) , + netherspite_infernalAI(Creature* c) : ScriptedAI(c), HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {} uint32 HellfireTimer; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 51085504f99..e13ef8f62e1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -424,10 +424,10 @@ public: for (uint32 i = 0; i < 4; ++i) { - if (Creature* pUnit = me->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000)) + if (Creature* unit = me->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000)) { - pUnit->Attack(me->getVictim(), true); - pUnit->setFaction(me->getFaction()); + unit->Attack(me->getVictim(), true); + unit->setFaction(me->getFaction()); } } @@ -438,10 +438,10 @@ public: { for (uint32 i = 0; i < 5; ++i) { - if (Creature* pUnit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) + if (Creature* unit = me->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { - pUnit->Attack(me->getVictim(), true); - pUnit->setFaction(me->getFaction()); + unit->Attack(me->getVictim(), true); + unit->setFaction(me->getFaction()); } } @@ -464,11 +464,11 @@ public: if (!FlameWreathTarget[i]) continue; - Unit* pUnit = Unit::GetUnit(*me, FlameWreathTarget[i]); - if (pUnit && !pUnit->IsWithinDist2d(FWTargPosX[i], FWTargPosY[i], 3)) + Unit* unit = Unit::GetUnit(*me, FlameWreathTarget[i]); + if (unit && !unit->IsWithinDist2d(FWTargPosX[i], FWTargPosY[i], 3)) { - pUnit->CastSpell(pUnit, 20476, true, 0, 0, me->GetGUID()); - pUnit->CastSpell(pUnit, 11027, true); + unit->CastSpell(unit, 20476, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, 11027, true); FlameWreathTarget[i] = 0; } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 05ad283a428..15c697198d0 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -183,7 +183,7 @@ public: void SetData64(uint32 identifier, uint64 data) { - switch(identifier) + switch (identifier) { case DATA_IMAGE_OF_MEDIVH: ImageGUID = data; } @@ -191,7 +191,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 183932: m_uiCurtainGUID = go->GetGUID(); break; case 184278: @@ -221,7 +221,7 @@ public: case 185119: DustCoveredChest = go->GetGUID(); break; } - switch(m_uiOperaEvent) + switch (m_uiOperaEvent) { //TODO: Set Object visibilities for Opera based on performance case EVENT_OZ: diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index e22bdb1e9ef..b8025c1adee 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -163,7 +163,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 0: DoCast(me, SPELL_TUXEDO, false); @@ -197,7 +197,7 @@ public: { int32 text = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: if (OzDialogue[count].textid) @@ -231,7 +231,7 @@ public: uint8 index = 0; uint8 count = 0; - switch(m_uiEventId) + switch (m_uiEventId) { case EVENT_OZ: index = 0; @@ -329,7 +329,7 @@ public: player->PlayerTalkClass->ClearMenus(); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -538,7 +538,7 @@ public: { Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); Map* pMap = me->GetMap(); - switch(Step) + switch (Step) { case 0: return 9999999; case 1: diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9f758edbba7..6802d1817a3 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -193,11 +193,11 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && unit->isAlive()) { - float threat = me->getThreatManager().getThreat(pUnit); - SummonedUnit->AddThreat(pUnit, threat); + float threat = me->getThreatManager().getThreat(unit); + SummonedUnit->AddThreat(unit, threat); } } } @@ -211,9 +211,9 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) - pUnit->CastSpell(pUnit, SPELL_TELEPORT_CENTER, true); + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) + unit->CastSpell(unit, SPELL_TELEPORT_CENTER, true); } DoCast(me, SPELL_TELEPORT_CENTER, true); } @@ -223,10 +223,10 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) // Knockback into the air - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID()); } } @@ -235,17 +235,17 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { // Also needs an exception in spell system. - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID()); // Use packet hack WorldPacket data(12); data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } } @@ -255,17 +255,17 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { - pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY); - pUnit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT); + unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY); + unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT); WorldPacket data(12); data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } } @@ -276,7 +276,7 @@ public: if (!UpdateVictim()) return; - switch(Phase) + switch (Phase) { case 0: { @@ -353,7 +353,7 @@ public: { if (GravityLapseTimer <= diff) { - switch(GravityLapsePhase) + switch (GravityLapsePhase) { case 0: if (FirstGravityLapse) // Different yells at 50%, and at every following Gravity Lapse diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index f54883daf56..ae7d7aba9f1 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -527,12 +527,12 @@ public: { DoCast(me, SPELL_VANISH); - Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0); DoResetThreat(); - if (pUnit) - me->AddThreat(pUnit, 1000.0f); + if (unit) + me->AddThreat(unit, 1000.0f); InVanish = true; Vanish_Timer = 30000; @@ -644,24 +644,24 @@ public: if (Seed_of_Corruption_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_SEED_OF_CORRUPTION); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_SEED_OF_CORRUPTION); Seed_of_Corruption_Timer = 10000; } else Seed_of_Corruption_Timer -= diff; if (Curse_of_Agony_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_CURSE_OF_AGONY); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_CURSE_OF_AGONY); Curse_of_Agony_Timer = 13000; } else Curse_of_Agony_Timer -= diff; if (Fear_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_FEAR); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_FEAR); Fear_Timer = 10000; } else Fear_Timer -= diff; @@ -806,8 +806,8 @@ public: if (Blizzard_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_BLIZZARD); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_BLIZZARD); Blizzard_Timer = 8000; } else Blizzard_Timer -= diff; @@ -937,8 +937,8 @@ public: //if nobody is in melee range than try to use Intercept if (!InMeleeRange) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_INTERCEPT_STUN); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_INTERCEPT_STUN); } Intercept_Stun_Timer = 10000; @@ -1168,8 +1168,8 @@ public: if (Purge_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_PURGE); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_PURGE); Purge_Timer = 15000; } else Purge_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 8b68330717f..35269bb296d 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -103,15 +103,15 @@ public: //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i) for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { - //Unit* pUnit = Unit::GetUnit(*me, FelCrystals[i]); - Unit* pUnit = Unit::GetUnit(*me, *itr); - if (pUnit) + //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]); + Unit* unit = Unit::GetUnit(*me, *itr); + if (unit) { - if (!pUnit->isAlive()) - CAST_CRE(pUnit)->Respawn(); // Let the core handle setting death state, etc. + if (!unit->isAlive()) + CAST_CRE(unit)->Respawn(); // Let the core handle setting death state, etc. // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here. - pUnit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + unit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 6e1574fe1c2..dd8031626bb 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -97,7 +97,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: return m_auiEncounter[0]; case DATA_VEXALLUS_EVENT: return m_auiEncounter[1]; @@ -111,7 +111,7 @@ public: void SetData(uint32 identifier, uint32 data) { - switch(identifier) + switch (identifier) { case DATA_SELIN_EVENT: m_auiEncounter[0] = data; break; case DATA_VEXALLUS_EVENT: @@ -139,7 +139,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24723: SelinGUID = creature->GetGUID(); break; case 24560: DelrissaGUID = creature->GetGUID(); break; @@ -149,7 +149,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 187896: VexallusDoorGUID = go->GetGUID(); break; //SunwellRaid Gate 02 @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SELIN: return SelinGUID; case DATA_DELRISSA: return DelrissaGUID; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index d39f8e455ff..3e95c613f23 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -59,7 +59,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAEL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index d2982900be1..9a3913cb7dd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -173,7 +173,7 @@ public: void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case PHASE_CHAINED: if (!anchorGUID) @@ -247,7 +247,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ICY_TOUCH: DoCast(me->getVictim(), SPELL_ICY_TOUCH); @@ -478,8 +478,8 @@ public: { me->setFaction(FACTION_HOSTILE); - if (Unit* pUnit = Unit::GetUnit(*me, m_uiDuelerGUID)) - AttackStart(pUnit); + if (Unit* unit = Unit::GetUnit(*me, m_uiDuelerGUID)) + AttackStart(unit); } else m_uiDuelTimer -= uiDiff; @@ -553,7 +553,7 @@ public: if (PhaseTimer <= diff) { - switch(Phase) + switch (Phase) { case 0: me->MonsterSay(SAY_DARK_RIDER, LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 532ede1d3c6..481c8647c82 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -109,7 +109,7 @@ public: return; } - switch(uiSpeech_counter) + switch (uiSpeech_counter) { case 1: DoScriptText(SAY_PERSUADED1, me); uiSpeech_timer = 8000; break; case 2: DoScriptText(SAY_PERSUADED2, me); uiSpeech_timer = 8000; break; @@ -220,7 +220,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_BREAKOUT1, me); @@ -281,7 +281,7 @@ public: { if (m_uiWave_Timer <= uiDiff) { - switch(m_uiWave) + switch (m_uiWave) { case 0: DoScriptText(SAY_BREAKOUT3, me); @@ -397,7 +397,7 @@ public: { if (uiStage_timer <= diff) { - switch(uiStage) + switch (uiStage) { case 1: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -610,7 +610,7 @@ public: bool MeetQuestCondition(Unit* player) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case 29061: // Ellen Stanbridge if (CAST_PLR(player)->GetQuestStatus(12742) == QUEST_STATUS_INCOMPLETE) @@ -682,10 +682,10 @@ public: //TODO: simplify text's selection - switch(player->getRace()) + switch (player->getRace()) { case RACE_HUMAN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -713,7 +713,7 @@ public: } break; case RACE_ORC: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -741,7 +741,7 @@ public: } break; case RACE_DWARF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_2, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -769,7 +769,7 @@ public: } break; case RACE_NIGHTELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -797,7 +797,7 @@ public: } break; case RACE_UNDEAD_PLAYER: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -825,7 +825,7 @@ public: } break; case RACE_TAUREN: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -853,7 +853,7 @@ public: } break; case RACE_GNOME: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -881,7 +881,7 @@ public: } break; case RACE_TROLL: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_3, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -909,7 +909,7 @@ public: } break; case RACE_BLOODELF: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; @@ -937,7 +937,7 @@ public: } break; case RACE_DRAENEI: - switch(ExecuteSpeech_Counter) + switch (ExecuteSpeech_Counter) { case 0: DoScriptText(SAY_EXEC_START_1, me, player); break; case 1: me->SetStandState(UNIT_STAND_STATE_STAND); break; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 2f7fde7ec60..2dc4553c3fa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -23,7 +23,7 @@ enum mograine { #ifdef LESS_MOB - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 10, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 1, // how many of earthshatter @@ -32,7 +32,7 @@ enum mograine ENCOUNTER_GHOUL_NUMBER = 5, // how many of ghoul ENCOUNTER_WARRIOR_NUMBER = 1, // how many of warrior #else - ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest , or - + ENCOUNTER_DK_NUMBER = 5, // how many player queue to start the quest, or - ENCOUNTER_DK_TIMER = 10, // *every 5 minutes. These have to be done in instance data ENCOUNTER_DEFENDER_NUMBER = 20, // how many of defender ENCOUNTER_EARTHSHATTER_NUMBER = 20, // how many of earthshatter diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index a948ffa53cd..e6610294071 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -69,7 +69,7 @@ public: if (!player) phase = 3; - switch(phase) + switch (phase) { case 0: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 80cbcedda7c..9296bd09bbc 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -153,7 +153,7 @@ public: void EnterCombat(Unit* /*who*/){} void SetType(uint32 _type) { - switch(Creaturetype = _type) + switch (Creaturetype = _type) { case 1: spell = SPELL_PUMPKIN_AURA_GREEN; @@ -257,7 +257,7 @@ public: if (withbody) return; - switch(Phase) + switch (Phase) { case 1: if (me->HealthBelowPctDamaged(67, damage)) @@ -569,9 +569,9 @@ public: std::list<HostileReference*>::const_iterator itr; for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive() && pUnit != caster) - me->AddThreat(pUnit, caster->getThreatManager().getThreat(pUnit)); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive() && unit != caster) + me->AddThreat(unit, caster->getThreatManager().getThreat(unit)); } } } @@ -608,7 +608,7 @@ public: { if (withhead) { - switch(Phase) + switch (Phase) { case 0: { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index f9856673f5c..256525379cd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -76,7 +76,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_PUMPKIN_SHRINE: PumpkinShrineGUID = go->GetGUID();break; case 104600: DoorHighInquisitorGUID = go->GetGUID(); break; @@ -85,7 +85,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_HORSEMAN: HorsemanGUID = creature->GetGUID(); break; case ENTRY_HEAD: HeadGUID = creature->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MOGRAINE_AND_WHITE_EVENT: if (data == IN_PROGRESS) @@ -130,7 +130,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { //case GAMEOBJECT_PUMPKIN_SHRINE: return PumpkinShrineGUID; //case DATA_HORSEMAN: return HorsemanGUID; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 52d8b2b926d..4e935280a6e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -132,7 +132,7 @@ public: DoModifyThreatPercent(target, -100); Creature* Summoned = NULL; - switch(rand()%6) + switch (rand()%6) { case 0: DoTeleportPlayer(target, 250.0696f, 0.3921f, 84.8408f, 3.149f); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 8945728e45d..ccbe8336097 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -83,7 +83,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GATE_KIRTONOS: GateKirtonosGUID = go->GetGUID(); break; case GO_GATE_GANDLING: GateGandlingGUID = go->GetGUID(); break; @@ -98,7 +98,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_LORDALEXEIBAROV_DEATH: IsBossDied[0] = true; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b08a73c320b..5de6143e5a4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -100,7 +100,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ASH: uiAshGUID = creature->GetGUID(); break; case NPC_ADA: uiAdaGUID = creature->GetGUID(); break; @@ -110,7 +110,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_COURTYARD_DOOR: DoorCourtyardGUID = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_FREE_NPC: if (data == DONE) @@ -157,7 +157,7 @@ public: m_auiEncounter[1] = data; break; case TYPE_FENRUS: - switch(data) + switch (data) { case DONE: uiTimer = 1000; @@ -192,7 +192,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_FREE_NPC: return m_auiEncounter[0]; @@ -248,7 +248,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: summon = pArchmage->SummonCreature(pArchmage->GetEntry(), SpawnLocation[4], TEMPSUMMON_TIMED_DESPAWN, 10000); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 25ff8c9d9ec..e034fa098f4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -101,7 +101,7 @@ public: void WaypointReached(uint32 uiPoint) { - switch(uiPoint) + switch (uiPoint) { case 0: if (uiNpcEntry == NPC_ASH) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index af71960763d..980e8e41a6a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -71,7 +71,7 @@ public: if (pInstance) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case SH_AELMAR: pInstance->SetData(TYPE_SH_AELMAR, 0); @@ -100,7 +100,7 @@ public: { if (pInstance) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case SH_AELMAR: pInstance->SetData(TYPE_SH_AELMAR, 2); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 82c83948c27..2f8d333735f 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -53,9 +53,9 @@ public: if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED) return false; - if (Group* pGroup = player->GetGroup()) + if (Group* group = player->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupie = itr->getSource(); if (!pGroupie) @@ -260,7 +260,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_DANCE: EnterEvadeMode(); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index 08ac34c938c..7c807859cbe 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -94,7 +94,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ATALAI_STATUE1: GOAtalaiStatue1 = go->GetGUID(); break; case GO_ATALAI_STATUE2: GOAtalaiStatue2 = go->GetGUID(); break; @@ -108,7 +108,7 @@ public: virtual void Update(uint32 /*diff*/) // correct order goes form 1-6 { - switch(State) + switch (State) { case GO_ATALAI_STATUE1: if (!s1 && !s2 && !s3 && !s4 && !s5 && !s6) diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 86ed6690751..caffb6c55d4 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -39,7 +39,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 644c0eacde5..4ca0846b04c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -183,7 +183,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_BLADES: case SPELL_SHADOW_NOVA: @@ -199,7 +199,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -477,7 +477,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_BLAZE: @@ -494,7 +494,7 @@ public: void HandleTouchedSpells(Unit* target, uint32 TouchedType) { - switch(TouchedType) + switch (TouchedType) { case SPELL_FLAME_TOUCHED: if (!target->HasAura(SPELL_DARK_FLAME)) @@ -702,7 +702,7 @@ public: void SpellHitTarget(Unit* target, const SpellInfo* spell) { - switch(spell->Id) + switch (spell->Id) { case SPELL_SHADOW_FURY: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 584ce3856a4..b79ec3a542d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -239,7 +239,7 @@ public: void EnterPhase(PhaseFelmyst NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_GROUND: me->CastStop(SPELL_FOG_BREATH); @@ -267,7 +267,7 @@ public: void HandleFlightSequence() { - switch(uiFlightCount) + switch (uiFlightCount) { case 0: //me->AttackStop(); @@ -416,7 +416,7 @@ public: if (phase == PHASE_GROUND) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); @@ -451,7 +451,7 @@ public: if (phase == PHASE_FLIGHT) { - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, me); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 39aa4f6f6f3..df20eab39de 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -389,7 +389,7 @@ public: void GoodEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: me->setFaction(35); @@ -411,7 +411,7 @@ public: void BadEnding() { - switch(TalkSequence) + switch (TalkSequence) { case 1: DoScriptText(SAY_EVIL_ENRAGE, me); @@ -491,7 +491,7 @@ public: if (YellTimer <= diff) { - switch(YellSequence) + switch (YellSequence) { case 0: DoScriptText(SAY_GOOD_AGGRO, me); @@ -760,11 +760,11 @@ public: { for (std::list<HostileReference*>::const_iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() > me->GetPositionZ()+5) + if (unit->GetPositionZ() > me->GetPositionZ()+5) { - me->getThreatManager().modifyThreatPercent(pUnit, -100); + me->getThreatManager().modifyThreatPercent(unit, -100); } } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 674f3ab19ca..e81d4975378 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -278,7 +278,7 @@ public: if (!pInstance) return NULL; - switch(index) + switch (index) { case 0: return pInstance->instance->GetGameObject(pInstance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1)); @@ -334,7 +334,7 @@ public: OrbsEmpowered = (OrbsEmpowered+1)%4; ++EmpowerCount; - switch(EmpowerCount) + switch (EmpowerCount) { case 1: DoScriptText(SAY_KALEC_ORB_READY1, me); break; case 2: DoScriptText(SAY_KALEC_ORB_READY2, me); break; @@ -445,7 +445,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_HAND_OF_THE_DECEIVER: summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false); @@ -697,13 +697,13 @@ public: { if (Timer[t] < diff && !TimerIsDeactivated[t]) { - switch(t) + switch (t) { case TIMER_SPEECH: if (SpeechBegins) { SpeechBegins=false; - switch(Phase) + switch (Phase) { case PHASE_NORMAL: speechPhaseEnd=1; @@ -994,9 +994,9 @@ public: std::list<HostileReference*>::iterator itr; for (itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { - Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pUnit) - pPortal->AddThreat(pUnit, 1.0f); + Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (unit) + pPortal->AddThreat(unit, 1.0f); } } FelfirePortalTimer = 20000; @@ -1139,7 +1139,7 @@ public: { if (uiTimer <= diff) { - switch(spell) + switch (spell) { case 0: DoCast(me, SPELL_ARMAGEDDON_VISUAL, true); @@ -1314,7 +1314,7 @@ public: } } - switch(victimClass) { + switch (victimClass) { case CLASS_DRUID: if (uiTimer[1] <= diff) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index c713c053222..50a5c83c370 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -85,8 +85,8 @@ float DarkFiends[8][4] = {1801.98f, 633.62f, 69.74f, 5.71f}, {1830.88f, 629.99f, 69.73f, 3.52f}, {1800.38f, 621.41f, 69.74f, 0.22f}, - {1808.3f , 612.45f, 69.73f, 1.02f}, - {1823.9f , 639.69f, 69.74f, 4.12f}, + {1808.3f, 612.45f, 69.73f, 1.02f}, + {1823.9f, 639.69f, 69.74f, 4.12f}, {1811.85f, 640.46f, 69.73f, 4.97f} }; @@ -95,7 +95,7 @@ float Humanoides[6][5] = {CREATURE_FURY_MAGE, 1780.16f, 666.83f, 71.19f, 5.21f}, {CREATURE_FURY_MAGE, 1847.93f, 600.30f, 71.30f, 2.57f}, {CREATURE_BERSERKER, 1779.97f, 660.64f, 71.19f, 5.28f}, - {CREATURE_BERSERKER, 1786.2f , 661.01f, 71.19f, 4.51f}, + {CREATURE_BERSERKER, 1786.2f, 661.01f, 71.19f, 4.51f}, {CREATURE_BERSERKER, 1845.17f, 602.63f, 71.28f, 2.43f}, {CREATURE_BERSERKER, 1842.91f, 599.93f, 71.23f, 2.44f} }; @@ -145,7 +145,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_DARK_FIENDS: summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); @@ -270,7 +270,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case BOSS_ENTROPIUS: me->SetVisible(false); @@ -294,7 +294,7 @@ public: { if (!pInstance) return; - switch(pInstance->GetData(DATA_MURU_EVENT)) + switch (pInstance->GetData(DATA_MURU_EVENT)) { case NOT_STARTED: Reset(); @@ -318,7 +318,7 @@ public: { if (Timer[i] <= diff) { - switch(i) + switch (i) { case TIMER_DARKNESS: if (!DarkFiend) @@ -419,7 +419,7 @@ public: me->GetHomePosition(x, y, z, o); DoTeleportTo(x, y, z); InAction = true; - switch(Spell->Id) + switch (Spell->Id) { case SPELL_OPEN_ALL_PORTALS: DoCastAOE(SPELL_OPEN_PORTAL, false); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index fb412b018f2..10ffb3703e0 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -140,7 +140,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 24850: Kalecgos_Dragon = creature->GetGUID(); break; case 24891: Kalecgos_Human = creature->GetGUID(); break; @@ -160,7 +160,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 188421: ForceField = go->GetGUID(); break; case 188523: KalecgosWall[0] = go->GetGUID(); break; @@ -181,7 +181,7 @@ public: uint32 GetData(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: return m_auiEncounter[0]; case DATA_BRUTALLUS_EVENT: return m_auiEncounter[1]; @@ -195,7 +195,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_KALECGOS_DRAGON: return Kalecgos_Dragon; case DATA_KALECGOS_HUMAN: return Kalecgos_Human; @@ -220,7 +220,7 @@ public: void SetData(uint32 id, uint32 data) { - switch(id) + switch (id) { case DATA_KALECGOS_EVENT: { @@ -246,7 +246,7 @@ public: m_auiEncounter[2] = data; break; case DATA_EREDAR_TWINS_EVENT: m_auiEncounter[3] = data; break; case DATA_MURU_EVENT: - switch(data) + switch (data) { case DONE: HandleGameObject(MurusGate[0], true); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index ea1a260b3af..094caaa1ec8 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -105,14 +105,14 @@ class instance_uldaman : public InstanceMapScript case GO_ALTAR_OF_THE_KEEPER_TEMPLE_DOOR: // lock the door uiAltarOfTheKeeperTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; case GO_ARCHAEDAS_TEMPLE_DOOR: uiArchaedasTempleDoor = go->GetGUID(); - if(m_auiEncounter[0] == DONE) + if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); break; @@ -121,7 +121,7 @@ class instance_uldaman : public InstanceMapScript go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); uiAncientVaultDoor = go->GetGUID(); - if(m_auiEncounter[1] == DONE) + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -165,7 +165,7 @@ class instance_uldaman : public InstanceMapScript void BlockGO(uint64 guid) { GameObject* go = instance->GetGameObject(guid); - if(!go) + if (!go) return; go->SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); @@ -255,7 +255,7 @@ class instance_uldaman : public InstanceMapScript void ActivateIronaya() { Creature* ironaya = instance->GetCreature(uiIronayaGUID); - if(!ironaya) + if (!ironaya) return; ironaya->setFaction(415); @@ -306,7 +306,7 @@ class instance_uldaman : public InstanceMapScript if (!bKeystoneCheck) return; - if(uiIronayaSealDoorTimer <= diff) + if (uiIronayaSealDoorTimer <= diff) { ActivateIronaya(); @@ -322,17 +322,17 @@ class instance_uldaman : public InstanceMapScript void SetData (uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALTAR_DOORS: m_auiEncounter[0] = data; - if(data == DONE) + if (data == DONE) SetDoor(uiAltarOfTheKeeperTempleDoor, true); break; case DATA_ANCIENT_DOOR: m_auiEncounter[1] = data; - if(data == DONE) //archeadas defeat + if (data == DONE) //archeadas defeat { SetDoor(uiArchaedasTempleDoor, true); //re open enter door SetDoor(uiAncientVaultDoor, true); @@ -348,7 +348,7 @@ class instance_uldaman : public InstanceMapScript break; case DATA_MINIONS: - switch(data) + switch (data) { case NOT_STARTED: if (m_auiEncounter[0] == DONE) //if players opened the doors @@ -446,7 +446,7 @@ class instance_uldaman : public InstanceMapScript case 7228: // Ironaya uiIronayaGUID = creature->GetGUID(); - if(m_auiEncounter[2] != DONE) + if (m_auiEncounter[2] != DONE) SetFrozenState (creature); break; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 9933529e59a..9ccf957120d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -155,7 +155,7 @@ class boss_halazzi : public CreatureScript void EnterPhase(PhaseHalazzi NextPhase) { - switch(NextPhase) + switch (NextPhase) { case PHASE_LYNX: case PHASE_ENRAGE: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index f19652f912d..213b37190ac 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -439,7 +439,7 @@ class boss_hexlord_malacrass : public CreatureScript { uint8 random = urand(0, 2); Unit* target = NULL; - switch(PlayerAbility[PlayerClass][random].target) + switch (PlayerAbility[PlayerClass][random].target) { case ABILITY_TARGET_SELF: target = me; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index ff4fe3f8a06..21e895e26bf 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -206,7 +206,7 @@ class boss_nalorakk : public CreatureScript { if (!inMove) { - switch(MovePhase) + switch (MovePhase) { case 0: if (me->IsWithinDistInMap(who, 50)) @@ -314,7 +314,7 @@ class boss_nalorakk : public CreatureScript if (MovePhase != id) return; - switch(MovePhase) + switch (MovePhase) { case 2: me->SetOrientation(3.1415f*2); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 83feaad071e..f5acbc8d976 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -340,7 +340,7 @@ class boss_zuljin : public CreatureScript void EnterPhase(uint32 NextPhase) { - switch(NextPhase) + switch (NextPhase) { case 0: break; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 35d103f2bb7..806536b7a59 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -116,7 +116,7 @@ class instance_zulaman : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23578://janalai case 23863://zuljin @@ -129,7 +129,7 @@ class instance_zulaman : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 186303: HalazziDoorGUID = go->GetGUID(); break; case 186304: ZulJinGateGUID = go->GetGUID(); break; @@ -205,7 +205,7 @@ class instance_zulaman : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: m_auiEncounter[0] = data; @@ -279,7 +279,7 @@ class instance_zulaman : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NALORAKKEVENT: return m_auiEncounter[0]; case DATA_AKILZONEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 12811742f26..10055b1fa01 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -65,7 +65,7 @@ class npc_forest_frog : public CreatureScript if (pInstance) { uint32 cEntry = 0; - switch(rand()%10) + switch (rand()%10) { case 0: cEntry = 24397; break; //Mannuth case 1: cEntry = 24403; break; //Deez diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 7f7a85b881f..6135c076920 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -160,23 +160,23 @@ class boss_mandokir : public CreatureScript { if (WatchTarget) //If someone is watched and If the Position of the watched target is different from the one stored, or are attacking, mandokir will charge him { - Unit* pUnit = Unit::GetUnit(*me, WatchTarget); + Unit* unit = Unit::GetUnit(*me, WatchTarget); - if (pUnit && ( - targetX != pUnit->GetPositionX() || - targetY != pUnit->GetPositionY() || - targetZ != pUnit->GetPositionZ() || - pUnit->isInCombat())) + if (unit && ( + targetX != unit->GetPositionX() || + targetY != unit->GetPositionY() || + targetZ != unit->GetPositionZ() || + unit->isInCombat())) { - if (me->IsWithinMeleeRange(pUnit)) + if (me->IsWithinMeleeRange(unit)) { - DoCast(pUnit, 24316); + DoCast(unit, 24316); } else { - DoCast(pUnit, SPELL_CHARGE); - //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true, 1); - AttackStart(pUnit); + DoCast(unit, SPELL_CHARGE); + //me->SendMonsterMove(unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ(), 0, true, 1); + AttackStart(unit); } } } @@ -198,12 +198,12 @@ class boss_mandokir : public CreatureScript if ((Watch_Timer < 1000) && endWatch) //1 sec before the debuf expire, store the target position { - Unit* pUnit = Unit::GetUnit(*me, WatchTarget); - if (pUnit) + Unit* unit = Unit::GetUnit(*me, WatchTarget); + if (unit) { - targetX = pUnit->GetPositionX(); - targetY = pUnit->GetPositionY(); - targetZ = pUnit->GetPositionZ(); + targetX = unit->GetPositionX(); + targetY = unit->GetPositionY(); + targetZ = unit->GetPositionZ(); } endWatch = false; } @@ -232,8 +232,8 @@ class boss_mandokir : public CreatureScript std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit(*me, (*i)->getUnitGuid()); - if (pUnit && me->IsWithinMeleeRange(pUnit)) + Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()); + if (unit && me->IsWithinMeleeRange(unit)) ++TargetInRange; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index d8ed6394e4c..bbff6a55ffb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -137,10 +137,7 @@ class boss_renataki : public CreatureScript Aggro_Timer = 7000 + rand()%13000; } else Aggro_Timer -= diff; - } - if (!Invisible) - { if (ThousandBlades_Timer <= diff) { DoCast(me->getVictim(), SPELL_THOUSANDBLADES); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index fddaf459d18..b0bbc0c6c79 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -178,22 +178,22 @@ class boss_venoxis : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { // thrash is available in all phases case EVENT_THRASH: DoCast(me, SPELL_THRASH, true); - events.ScheduleEvent(EVENT_THRASH, urand(10000,20000)); + events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000)); break; // troll form spells and actions (first part) case EVENT_DISPEL_MAGIC: DoCast(me, SPELL_DISPEL_MAGIC); - events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000,20000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000), 0, PHASE_ONE); break; case EVENT_RENEW: DoCast(me, SPELL_RENEW); - events.ScheduleEvent(EVENT_RENEW, urand(25000,30000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_RENEW, urand(25000, 30000), 0, PHASE_ONE); break; case EVENT_HOLY_NOVA: _inMeleeRange = 0; @@ -210,17 +210,17 @@ class boss_venoxis : public CreatureScript if (_inMeleeRange >= 3) DoCast(me->getVictim(), SPELL_HOLY_NOVA); - events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000,75000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000, 75000), 0, PHASE_ONE); break; case EVENT_HOLY_FIRE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_FIRE); - events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000, 60000), 0, PHASE_ONE); break; case EVENT_HOLY_WRATH: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_HOLY_WRATH); - events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000,60000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000, 60000), 0, PHASE_ONE); break; // @@ -230,12 +230,12 @@ class boss_venoxis : public CreatureScript case EVENT_VENOM_SPIT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_VENOM_SPIT); - events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000,15000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000, 15000), 0, PHASE_TWO); break; case EVENT_POISON_CLOUD: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(target, SPELL_POISON_CLOUD); - events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000,20000), 0, PHASE_TWO); + events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000, 20000), 0, PHASE_TWO); break; case EVENT_PARASITIC_SERPENT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 0da63d38f83..a977699f342 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -65,7 +65,7 @@ class instance_zulgurub : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11347: m_uiLorKhanGUID = creature->GetGUID(); break; case 11348: m_uiZathGUID = creature->GetGUID(); break; @@ -76,7 +76,7 @@ class instance_zulgurub : public InstanceMapScript void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: m_auiEncounter[0] = uiData; @@ -114,7 +114,7 @@ class instance_zulgurub : public InstanceMapScript uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ARLOKK: return m_auiEncounter[0]; @@ -138,7 +138,7 @@ class instance_zulgurub : public InstanceMapScript uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_LORKHAN: return m_uiLorKhanGUID; diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index c5d47b60dfd..0ce940723cb 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -71,7 +71,7 @@ class npc_professor_phizzlethorpe : public CreatureScript if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 4:DoScriptText(SAY_PROGRESS_2, me, player);break; case 5:DoScriptText(SAY_PROGRESS_3, me, player);break; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 145e560c946..7487ddbc548 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -34,7 +34,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->HasQuestForItem(21149)) { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 6960fed819e..10b7066068b 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -56,7 +56,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -222,7 +222,7 @@ public: spellJudLight = false; spellCommand = false; - switch(me->GetEntry()) + switch (me->GetEntry()) { case CHAMPION_BLOODWRATH: spellFlashLight = true; @@ -417,7 +417,7 @@ public: { CAST_AI(npc_second_trial_paladin::npc_secondTrialAI, paladinSpawn->AI())->Activate(me->GetGUID()); - switch(paladinPhase) + switch (paladinPhase) { case 0: DoScriptText(TEXT_SECOND_TRIAL_1, me); diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 9efe8301e10..655ad4514fe 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index df8b909976d..38fcf63b090 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -89,7 +89,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 26: DoScriptText(SAY_OOX_AMBUSH, me); @@ -107,7 +107,7 @@ public: void WaypointStart(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 27: for (uint8 i = 0; i < 3; ++i) @@ -284,7 +284,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 1: DoScriptText(SAY_RIN_FREE, me, player); @@ -317,7 +317,7 @@ public: if (Unit* player = GetPlayerForEscort()) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 1: DoScriptText(SAY_RIN_PROGRESS_1, me, player); diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 7e376b65020..083a27568bd 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -86,7 +86,7 @@ public: if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING) me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - switch(uiI) + switch (uiI) { case 39: SetEscortPaused(true); @@ -115,7 +115,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: me->SetStandState(UNIT_STAND_STATE_SIT); diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index cfcef442c93..32b4fc0e19a 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -141,7 +141,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: DoScriptText(SAY_START, me, player);break; case 13: diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 88f76d47c53..25fa0352548 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -346,7 +346,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 14: SetEscortPaused(true); @@ -387,7 +387,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* pGuard = me->FindNearestCreature(NPC_STORMWIND_ROYAL, 8.0f, true)) @@ -577,7 +577,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 1: SetEscortPaused(true); @@ -605,7 +605,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_QUEST_ACCEPT_ATTACK, me); diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index c1f543fff65..e2a7ea9d3c6 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -123,7 +123,7 @@ public: return; } - switch(m_uiPhase) + switch (m_uiPhase) { case 1: DoScriptText(SAY_COMPLETE, me); diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 2a2becb906f..06c64b76242 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -52,7 +52,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -191,7 +191,7 @@ public: if (who->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetAreaId()) + switch (me->GetAreaId()) { case 199: //felstone if (CAST_PLR(who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE || @@ -358,7 +358,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f , 81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index da1f666fbab..7c0703d158b 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -83,7 +83,7 @@ public: { if (HasEscortState(STATE_ESCORT_ESCORTING)) { - switch(uiWPHolder) + switch (uiWPHolder) { case 7: DoScriptText(SAY_DS_DOWN_1, me); break; case 8: DoScriptText(SAY_DS_DOWN_2, me); break; @@ -105,7 +105,7 @@ public: uiWPHolder = uiPoint; - switch(uiPoint) + switch (uiPoint) { case 4: SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp index 89effa01b98..f6d53d2bb51 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/wetlands.cpp @@ -69,7 +69,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 2: if (me->HasStealthAura()) diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index d1ac2045e61..1a030728218 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -148,7 +148,7 @@ class example_creature : public CreatureScript { me->HandleEmoteCommand(uiTextEmote); - switch(uiTextEmote) + switch (uiTextEmote) { case TEXT_EMOTE_DANCE: DoScriptText(SAY_DANCE, me); diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index fa62563e25d..dfac4321a23 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -202,7 +202,7 @@ class example_escort : public CreatureScript player->PlayerTalkClass->ClearMenus(); npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index adafc78f33f..7823e84f29a 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -204,7 +204,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); @@ -238,7 +238,7 @@ public: void WaypointReached(uint32 uiPoint) { - switch(uiPoint) + switch (uiPoint) { case 4: SetEscortPaused(true); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 07c7fcf6f27..cf79dfee77d 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -109,7 +109,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FIRE_OF_AKU_MAI_1: m_uiShrine1GUID = go->GetGUID(); @@ -143,7 +143,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: m_auiEncounter[0] = uiData; @@ -213,7 +213,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_GELIHAST: return m_auiEncounter[0]; @@ -234,7 +234,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_TWILIGHT_LORD_KELRIS: return m_uiTwilightLordKelrisGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 5a28f3af333..da316cb91c7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -311,7 +311,7 @@ public: void GainSoulCharge(Player* victim) { - switch(victim->getClass()) + switch (victim->getClass()) { case CLASS_PRIEST: case CLASS_PALADIN: @@ -358,9 +358,9 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive()) + targets.push_back(unit); } if (targets.empty()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index ef3b2b77406..f681b245a42 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -54,7 +54,7 @@ public: { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); @@ -131,7 +131,7 @@ public: player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); ai->DeSpawnVeins();//despawn the alliance veins - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(player); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1d1b1902188..385e86e5069 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -361,7 +361,7 @@ void hyjalAI::Reset() EnemyCount = 0; // Set faction properly based on Creature entry - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA: Faction = 0; @@ -450,7 +450,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) SpawnLoc[i] = Base[random][i]; } Creature* creature = NULL; - switch(entry) + switch (entry) { case 17906: //GARGOYLE @@ -463,7 +463,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; - case 17907: //FROST_WYRM , + case 17907: //FROST_WYRM, if (FirstBossDead && WaveCount == 1) //summon at gate creature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); else @@ -492,7 +492,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); creature->setActive(true); - switch(entry) + switch (entry) { case NECROMANCER: case ABOMINATION: @@ -714,9 +714,9 @@ void hyjalAI::DeSpawnVeins() return; if (Faction == 1) { - Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + Creature* unit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (!unit)return; + hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); if (!ai)return; for (uint8 i = 0; i<7; ++i) { @@ -725,9 +725,9 @@ void hyjalAI::DeSpawnVeins() } } else if (Faction) { - Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + Creature* unit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); + if (!unit)return; + hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); if (!ai)return; for (uint8 i = 7; i<14; ++i) { @@ -751,7 +751,7 @@ void hyjalAI::UpdateAI(const uint32 diff) if (DoHide) { DoHide = false; - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA: if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT)) @@ -810,7 +810,7 @@ void hyjalAI::UpdateAI(const uint32 diff) IsDummy = true; bRetreat = false; HideNearPos(me->GetPositionX(), me->GetPositionY()); - switch(me->GetEntry()) + switch (me->GetEntry()) { case JAINA://jaina HideNearPos(5037.76f, -1889.71f); @@ -853,8 +853,8 @@ void hyjalAI::UpdateAI(const uint32 diff) { if (BossGUID[i]) { - Unit* pUnit = Unit::GetUnit((*me), BossGUID[i]); - if (pUnit && (!pUnit->isAlive())) + Unit* unit = Unit::GetUnit((*me), BossGUID[i]); + if (unit && (!unit->isAlive())) { if (BossGUID[i] == BossGUID[0]) { @@ -892,7 +892,7 @@ void hyjalAI::UpdateAI(const uint32 diff) Unit* target = NULL; - switch(Spells[i].TargetType) + switch (Spells[i].TargetType) { case TARGETTYPE_SELF: target = me; break; case TARGETTYPE_RANDOM: target = SelectTarget(SELECT_TARGET_RANDOM, 0); break; @@ -1071,7 +1071,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) if (!Teleported) return; Overrun = false;//execute once - switch(faction) + switch (faction) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires @@ -1080,37 +1080,37 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 3; ++i)//summon 3 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 5; ++i)//summon 5 gargoyles { - Creature* pUnit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - pUnit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + unit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } break; @@ -1120,38 +1120,38 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 26; ++i)//summon infernals { - Creature* pUnit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - pUnit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + unit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } for (uint8 i = 0; i < 5; ++i)//summon 5 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) + Creature* unit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (unit) { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); + CAST_AI(hyjal_trashAI, unit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, unit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, unit->AI())->OverrunType = i; + unit->setActive(true); } } break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 6a7e6f71003..8ca0ba5efd2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -197,7 +197,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); @@ -257,7 +257,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 4; ++i) AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); @@ -332,7 +332,7 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) { for (uint8 i = 0; i < 6; ++i) AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); - switch(OverrunType) + switch (OverrunType) { case 0: AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 282b0192f57..e3d57414b94 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -117,7 +117,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 182060: HordeGate = go->GetGUID(); @@ -141,7 +141,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17767: RageWinterchill = creature->GetGUID(); break; case 17808: Anetheron = creature->GetGUID(); break; @@ -156,7 +156,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_RAGEWINTERCHILL: return RageWinterchill; case DATA_ANETHERON: return Anetheron; @@ -173,7 +173,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; case DATA_ANETHERONEVENT: @@ -191,12 +191,12 @@ public: Creature* creature = instance->GetCreature(Azgalor); if (creature) { - Creature* pUnit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); + Creature* unit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); Map* pMap = creature->GetMap(); - if (pMap->IsDungeon() && pUnit) + if (pMap->IsDungeon() && unit) { - pUnit->SetVisible(false); + unit->SetVisible(false); Map::PlayerList const &PlayerList = pMap->GetPlayers(); if (PlayerList.isEmpty()) return; @@ -206,7 +206,7 @@ public: if (i->getSource()) { WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); + unit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); i->getSource()->GetSession()->SendPacket(&data); WorldPacket data2(SMSG_PLAY_SOUND, 4); @@ -282,7 +282,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0]; case DATA_ANETHERONEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index f557354192a..3912ef90c9c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -126,7 +126,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case COMBAT: //Return since we have no target @@ -195,7 +195,7 @@ public: case OUTRO: if (uiOutroTimer < diff) { - switch(uiOutroStep) + switch (uiOutroStep) { case 1: DoScriptText(SAY_ESCAPE_SPEECH_1, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 678a38ffeca..3aee0ba30d0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -377,7 +377,7 @@ public: if (pInstance) { pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); - switch(pInstance->GetData(DATA_ARTHAS_EVENT)) + switch (pInstance->GetData(DATA_ARTHAS_EVENT)) { case NOT_STARTED: bStepping = true; @@ -448,7 +448,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: case 1: @@ -575,7 +575,7 @@ public: { if (uiPhaseTimer <= diff) { - switch(uiStep) + switch (uiStep) { //After reset case 0: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 1837dd33949..46eef1d8bb4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -149,7 +149,7 @@ public: uint8 GetRiftWaveId() { - switch(mRiftPortalCount) + switch (mRiftPortalCount) { case 6: mRiftWaveId = 2; @@ -166,7 +166,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_MEDIVH: if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS) @@ -237,7 +237,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_MEDIVH: return m_auiEncounter[0]; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 28f5477fe80..115fa1ededb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -103,7 +103,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case THRALL_ENTRY: ThrallGUID = creature->GetGUID(); @@ -127,7 +127,7 @@ public: return; } - switch(type) + switch (type) { case TYPE_BARREL_DIVERSION: { @@ -202,7 +202,7 @@ public: uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_BARREL_DIVERSION: return m_auiEncounter[0]; @@ -222,7 +222,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THRALL: return ThrallGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 485c52d0423..4f49c08f16a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -202,7 +202,7 @@ public: { player->PlayerTalkClass->ClearMenus(); InstanceScript* pInstance = creature->GetInstanceScript(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -301,7 +301,7 @@ public: if (!pInstance) return; - switch(i) + switch (i) { case 8: SetRun(false); @@ -513,7 +513,7 @@ public: void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { //TODO: make Scarloc start into event instead, and not start attack directly case MOB_ENTRY_BARN_GUARDSMAN: @@ -633,7 +633,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 6: DoScriptText(SAY_TA_FREE, me); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 84923d3def5..1c69e72befe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -85,7 +85,7 @@ public: return; } - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_WHELP_SPAWNER: Position goPos; @@ -141,7 +141,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: m_auiEncounter[0] = uiData; @@ -174,7 +174,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_FLOOR_ERUPTION_GUID: FloorEruptionGUID[1] = FloorEruptionGUID[0]; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_ONYXIA: return m_auiEncounter[0]; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ONYXIA_GUID: return m_uiOnyxiasGUID; @@ -238,7 +238,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: // Criteria for achievement 4403: Many Whelps! Handle It! (10 player) Hatch 50 eggs in 10s case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER: // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 19287d656a8..0082839e38f 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -100,7 +100,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_GONG: uiGongGUID = go->GetGUID(); @@ -118,7 +118,7 @@ public: { uiGongWaves = uiData; - switch(uiGongWaves) + switch (uiGongWaves) { case 9: case 14: @@ -139,7 +139,7 @@ public: uint32 uiCreature = 0; uint8 uiSummonTimes = 0; - switch(uiGongWaves) + switch (uiGongWaves) { case 1: uiCreature = CREATURE_TOMB_FIEND; @@ -186,7 +186,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG_WAVES: return uiGongWaves; @@ -197,7 +197,7 @@ public: uint64 GetData64(uint32 uiType) { - switch(uiType) + switch (uiType) { case DATA_GONG: return uiGongGUID; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index a251e6dfdf3..568bf355d06 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -69,7 +69,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 21099: DoorWardGUID = go->GetGUID(); break; } @@ -78,7 +78,7 @@ public: void Update(uint32 /*diff*/) { if (WardKeeperDeath == WARD_KEEPERS_NR) - if(GameObject* pGo = instance->GetGameObject(DoorWardGUID)) + if (GameObject* pGo = instance->GetGameObject(DoorWardGUID)) { pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33); pGo->SetGoState(GO_STATE_ACTIVE); @@ -87,7 +87,7 @@ public: void SetData(uint32 type, uint32 /*data*/) { - switch(type) + switch (type) { case EVENT_WARD_KEEPER: WardKeeperDeath++; break; } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 697083aa4e7..7b084a3b5fc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -54,7 +54,7 @@ class boss_kurinnaxx : public CreatureScript _Reset(); _enraged = false; events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); events.ScheduleEvent(EVENT_TRASH, 1000); events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } @@ -91,7 +91,7 @@ class boss_kurinnaxx : public CreatureScript target->CastSpell(target, SPELL_SANDTRAP, true); else if (Unit* victim = me->getVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); - events.ScheduleEvent(EVENT_SANDTRAP, urand(5000,15000)); + events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000)); break; case EVENT_WIDE_SLASH: DoCast(me, SPELL_WIDE_SLASH); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 8afdc29b76e..030da10e515 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -152,7 +152,7 @@ class boss_moam : public CreatureScript for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); - events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000,15000)); + events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000)); break; }/* case EVENT_WIDE_SLASH: diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 1a939123779..7244d78e83d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -576,11 +576,11 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only units out of stomach - if (pUnit && i->second == false) - temp.push_back(pUnit); + if (unit && i->second == false) + temp.push_back(unit); ++i; } @@ -592,7 +592,7 @@ public: //Get random but only if we have more than one unit on threat list if (temp.size() > 1) - advance (j , rand() % (temp.size() - 1)); + advance (j, rand() % (temp.size() - 1)); return (*j); } @@ -724,19 +724,19 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only move units in stomach - if (pUnit && i->second == true) + if (unit && i->second == true) { //Teleport each player out - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); //Cast knockback on them - DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true); + DoCast(unit, SPELL_EXIT_STOMACH_KNOCKBACK, true); //Remove the acid debuff - pUnit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); + unit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); i->second = false; } @@ -755,25 +755,25 @@ public: while (i != Stomach_Map.end()) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, i->first); + Unit* unit = Unit::GetUnit(*me, i->first); //Only apply to units in stomach - if (pUnit && i->second == true) + if (unit && i->second == true) { //Cast digestive acid on them - DoCast(pUnit, SPELL_DIGESTIVE_ACID, true); + DoCast(unit, SPELL_DIGESTIVE_ACID, true); //Check if player should be kicked from stomach - if (pUnit->IsWithinDist3d(&KickPos, 15.0f)) + if (unit->IsWithinDist3d(&KickPos, 15.0f)) { //Teleport each player out - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+10, float(rand()%6)); //Cast knockback on them - DoCast(pUnit, SPELL_EXIT_STOMACH_KNOCKBACK, true); + DoCast(unit, SPELL_EXIT_STOMACH_KNOCKBACK, true); //Remove the acid debuff - pUnit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); + unit->RemoveAurasDueToSpell(SPELL_DIGESTIVE_ACID); i->second = false; } @@ -805,11 +805,11 @@ public: if (StomachEnterVisTimer <= diff) { //Check for valid player - Unit* pUnit = Unit::GetUnit(*me, StomachEnterTarget); + Unit* unit = Unit::GetUnit(*me, StomachEnterTarget); - if (pUnit) + if (unit) { - DoTeleportPlayer(pUnit, STOMACH_X, STOMACH_Y, STOMACH_Z, STOMACH_O); + DoTeleportPlayer(unit, STOMACH_X, STOMACH_Y, STOMACH_Z, STOMACH_O); } StomachEnterTarget = 0; @@ -916,7 +916,7 @@ public: void DoAction(const int32 param) { - switch(param) + switch (param) { case ACTION_FLESH_TENTACLE_KILLED: ++FleshTentaclesKilled; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 8a40096bc33..9d83bfea866 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -145,7 +145,7 @@ public: if (DoGetThreat(target)) DoModifyThreatPercent(target, -100); - switch(urand(0, 2)) + switch (urand(0, 2)) { case 0: DoTeleportPlayer(target, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index a4d204014da..6a29dab356c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -91,7 +91,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_VEMISDEAD: if (IsBossDied[0]) @@ -119,7 +119,7 @@ public: uint64 GetData64 (uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SKERAM: return SkeramGUID; @@ -137,7 +137,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_VEM_DEATH: IsBossDied[0] = true; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 22973967052..8b4b1df4420 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -158,7 +158,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_END_DOOR: EndDoorGUID = go->GetGUID(); @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case EVENT_PYRAMID: return PyramidPhase; @@ -178,7 +178,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case ENTRY_ZUMRAH: return ZumrahGUID; @@ -200,7 +200,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case EVENT_PYRAMID: PyramidPhase=data; @@ -322,7 +322,7 @@ public: } bool IsWaveAllDead(){ - for(std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) + for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr) { if (Creature* add = instance->GetCreature((*itr))) { @@ -330,7 +330,7 @@ public: return false; } } - for(std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) + for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr) { if (Creature* add = instance->GetCreature(((*itr)))) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index e6a4bca2f91..45ec61aacb4 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 375e586f13b..f634d593f44 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -24,7 +24,7 @@ enum zfPyramidPhases { PYRAMID_NOT_STARTED, //default PYRAMID_CAGES_OPEN, //happens in GO hello for cages - PYRAMID_ARRIVED_AT_STAIR , //happens in Weegli's movementinform + PYRAMID_ARRIVED_AT_STAIR, //happens in Weegli's movementinform PYRAMID_WAVE_1, PYRAMID_PRE_WAVE_2, PYRAMID_WAVE_2, diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 527d6b3d3e4..58432eb9e01 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -186,7 +186,7 @@ class npc_ruul_snowhoof : public CreatureScript if (!player) return; - switch(i) + switch (i) { case 0: { me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); @@ -319,7 +319,7 @@ class npc_muglash : public CreatureScript { Player* player = GetPlayerForEscort(); - switch(i) + switch (i) { case 0: if (player) @@ -382,7 +382,7 @@ class npc_muglash : public CreatureScript void DoWaveSummon() { - switch(m_uiWaveId) + switch (m_uiWaveId) { case 1: me->SummonCreature(NPC_WRATH_RIDER, m_afFirstNagaCoord[0][0], m_afFirstNagaCoord[0][1], m_afFirstNagaCoord[0][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index e043f9e05b4..b572d132c26 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -376,7 +376,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_START, me, player); @@ -479,7 +479,7 @@ public: { Creature* Spark = Unit::GetCreature(*me, SparkGUID); - switch(Step) + switch (Step) { case 0: if (Spark) diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 8bfefade07e..6bbc29dcc56 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -87,10 +87,10 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { - DoTeleportPlayer(pUnit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, pUnit->GetOrientation()); + DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, unit->GetOrientation()); } } diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 3242797d3e7..01325d5bfff 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -238,7 +238,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY_REM_START, me, player); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index f0f27db8095..e79ab78f46b 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -299,7 +299,7 @@ public: if (bYellTimer && uiYellTimer <= uiDiff) { - switch(uiStep) + switch (uiStep) { case 0: DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); @@ -535,8 +535,8 @@ public: SetCombatMovement(true); if (me->isInCombat()) - if (Unit* pUnit = me->getVictim()) - me->GetMotionMaster()->MoveChase(pUnit); + if (Unit* unit = me->getVictim()) + me->GetMotionMaster()->MoveChase(unit); } void MoveToDock() @@ -590,7 +590,7 @@ public: bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) { - if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || QUEST_STINKYS_ESCAPE_A) + if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { if (npc_stinkyAI* pEscortAI = CAST_AI(npc_stinky::npc_stinkyAI, creature->AI())) { @@ -823,6 +823,36 @@ class spell_energize_aoe : public SpellScriptLoader } }; +/*###### +## go_blackhoof_cage +######*/ + +enum PrisonersOfTheGrimTotems +{ + NPC_THERAMORE_PRISONER = 23720, + SAY_FREE = 0, +}; + +class go_blackhoof_cage : public GameObjectScript +{ +public: + go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } + + bool OnGossipHello(Player* player, GameObject* go) + { + if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) + { + go->UseDoorOrButton(); + if (player) + player->KilledMonsterCredit(NPC_THERAMORE_PRISONER, 0); + + prisoner->AI()->Talk(SAY_FREE); // We also emote cry here (handled in creature_text.emote) + prisoner->ForcedDespawn(6000); + } + return true; + } +}; + void AddSC_dustwallow_marsh() { new mobs_risen_husk_spirit(); @@ -836,4 +866,5 @@ void AddSC_dustwallow_marsh() new spell_ooze_zap(); new spell_ooze_zap_channel_end(); new spell_energize_aoe(); + new go_blackhoof_cage(); } diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 822ac41f1c9..98e1130d3f7 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -146,9 +146,9 @@ public: case 30: DoScriptText(SAY_OOX_AMBUSH, me); me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: DoScriptText(SAY_OOX_END, me); diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index a714f8716ae..b8b8b31ba2c 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -57,7 +57,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -172,7 +172,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -348,7 +348,7 @@ public: void EnterCombat(Unit* who) { uint32 rnd = rand()%2; - switch(rnd) + switch (rnd) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1, me, who); break; case 1: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2, me, who); break; @@ -402,10 +402,10 @@ public: return; } - switch(CurrWP) + switch (CurrWP) { case 0: - switch(Step) + switch (Step) { case 0: me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); @@ -418,7 +418,7 @@ public: } break; case 6: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -433,7 +433,7 @@ public: } break; case 15: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -447,7 +447,7 @@ public: } break; case 16: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player); @@ -460,7 +460,7 @@ public: } break; case 20: - switch(Step) + switch (Step) { case 0: { @@ -480,7 +480,7 @@ public: } break; case 24: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 133); @@ -494,7 +494,7 @@ public: } break; case 25: - switch(Step) + switch (Step) { case 0: DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player); @@ -507,7 +507,7 @@ public: } break; case 40: - switch(Step) + switch (Step) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index d0131068c3f..947c5236e14 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -157,12 +157,12 @@ public: uiEventTimer = 5000; ++uiEventPhase; - switch(uiEventPhase) + switch (uiEventPhase) { case 1: - if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) + if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = pUnit->GetGameObject(SPELL_LUNCH)) + if (GameObject* pGo = unit->GetGameObject(SPELL_LUNCH)) { m_bIsMovingToLunch = true; me->GetMotionMaster()->MovePoint(POINT_ID, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ()); @@ -174,8 +174,8 @@ public: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); break; case 3: - if (Player* pUnit = Unit::GetPlayer(*me, uiPlayerGUID)) - pUnit->TalkedToCreature(me->GetEntry(), me->GetGUID()); + if (Player* unit = Unit::GetPlayer(*me, uiPlayerGUID)) + unit->TalkedToCreature(me->GetEntry(), me->GetGUID()); me->UpdateEntry(NPC_KYLE_FRIENDLY); break; diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 000717e1c56..4fbcef167cc 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -37,7 +37,7 @@ EndContentData */ ###*/ #define GOSSIP_DEMITRIAN1 "What do you know of it?" -#define GOSSIP_DEMITRIAN2 "I am listening , Demitrian." +#define GOSSIP_DEMITRIAN2 "I am listening, Demitrian." #define GOSSIP_DEMITRIAN3 "Continue, please." #define GOSSIP_DEMITRIAN4 "A battle?" #define GOSSIP_DEMITRIAN5 "<Nod>" @@ -541,7 +541,7 @@ public: switch (AnimationCount) { case 0: - DoScriptText(ANACHRONOS_SAY_1, me , Fandral); + DoScriptText(ANACHRONOS_SAY_1, me, Fandral); break; case 1: Fandral->SetTarget(me->GetGUID()); @@ -762,7 +762,7 @@ public: case 61: me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); if (player->IsInRange(me, 0, 15)) - player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); + player->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD, me); break; case 62: me->SetDisplayId(15500); @@ -1181,12 +1181,12 @@ enum WSCreatures NPC_TEMPLAR_WATER = 15211, NPC_TEMPLAR_AIR = 15212, NPC_TEMPLAR_EARTH = 15307, - + NPC_DUKE_FIRE = 15206, NPC_DUKE_WATER = 15207, NPC_DUKE_EARTH = 15208, NPC_DUKE_AIR = 15220, - + NPC_ROYAL_FIRE = 15203, NPC_ROYAL_AIR = 15204, NPC_ROYAL_EARTH = 15205, diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 132144fce0e..ff6127f336e 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -121,7 +121,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 16: DoScriptText(SAY_AMBUSH, me); diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 0c4b73b8658..549d741459e 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -178,7 +178,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(WHISPER_CUSTODIAN_1, me, player); break; case 1: DoScriptText(WHISPER_CUSTODIAN_2, me, player); break; @@ -435,7 +435,7 @@ public: if (!player) return; - switch(i) { + switch (i) { case 23: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); @@ -591,7 +591,7 @@ public: return; } - switch(m_uiPhasePostEvent) + switch (m_uiPhasePostEvent) { case 1: DoScriptText(SAY_TOOG_POST_1, me); diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 21b0a5c6ee1..41d64ea5e19 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -134,7 +134,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 16: DoScriptText(SAY_GIL_AT_LAST, me, player); @@ -597,7 +597,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_STARTUP1, me); @@ -625,7 +625,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 9: DoScriptText(SAY_STARTUP2, me, player); @@ -654,7 +654,7 @@ public: { if (m_uiPostEventTimer <= uiDiff) { - switch(m_uiPostEventCount) + switch (m_uiPostEventCount) { case 0: DoScriptText(SAY_PROGRESS_2, me); diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index fdff6309be3..273396dd904 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -77,7 +77,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(SAY_KAN_START, me); @@ -168,7 +168,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 8: DoScriptText(SAY_LAKO_LOOK_OUT, me); @@ -253,7 +253,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 15: DoScriptText(SAY_WYVERN, me); @@ -302,7 +302,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 05ba6b2234e..51f63ff5a8d 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -283,7 +283,7 @@ public: return; } - switch(m_uiEndEventProgress) + switch (m_uiEndEventProgress) { case 1: DoScriptText(SAY_RIN_END_1, me); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 71f810a6020..efbc2c45e40 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -179,7 +179,7 @@ public: case PHASE_UNDERGROUND: if (uiImpaleTimer <= diff) { - switch(uiImpalePhase) + switch (uiImpalePhase) { case IMPALE_PHASE_TARGET: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) 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 7d35814a8a0..4ea135a2294 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -71,7 +71,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 28684: uiKrikthir = creature->GetGUID(); break; case 28921: uiHadronox = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_KRIKTHIR_THE_GATEWATCHER: return uiKrikthir; case DATA_HADRONOX: return uiHadronox; @@ -120,7 +120,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; @@ -149,7 +149,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: return auiEncounter[0]; case DATA_HADRONOX_EVENT: return auiEncounter[1]; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 2e0e0661cf7..05b8881a322 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -440,7 +440,7 @@ public: if (uiType != POINT_MOTION_TYPE || !pInstance) return; - switch(uiPointId) + switch (uiPointId) { case 1: { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 347283a891b..c22a5489358 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -397,7 +397,7 @@ public: pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); pGO->SetGoState(GO_STATE_ACTIVE); - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 352ac2d09e5..e7c4b517cbf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -94,7 +94,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 29309: Elder_Nadox = creature->GetGUID(); break; case 29308: Prince_Taldaram = creature->GetGUID(); break; @@ -107,7 +107,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; @@ -134,7 +134,7 @@ public: void SetData64(uint32 idx, uint64 guid) { - switch(idx) + switch (idx) { case DATA_ADD_JEDOGA_OPFER: JedogaSacrifices = guid; break; case DATA_PL_JEDOGA_TARGET: JedogaTarget = guid; break; @@ -143,7 +143,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_ELDER_NADOX: return Elder_Nadox; case DATA_PRINCE_TALDARAM: return Prince_Taldaram; @@ -176,7 +176,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: @@ -223,7 +223,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ELDER_NADOX_EVENT: return m_auiEncounter[0]; case DATA_PRINCE_TALDARAM_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 3e1f500ebce..63e714d17aa 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -173,6 +173,7 @@ set(scripts_STAT_SRCS Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp Northrend/IcecrownCitadel/boss_sindragosa.cpp + Northrend/IcecrownCitadel/boss_the_lich_king.cpp Northrend/zuldrak.cpp Northrend/icecrown.cpp Northrend/Gundrak/boss_slad_ran.cpp diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index d29a05b3b5d..2a1c0bd6e91 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -188,21 +188,21 @@ static Location AcolyteofVesperon = { 3145.68f, 520.71f, 89.7f }; static Location AcolyteofVesperon2 = { 3246.57f, 551.263f, 58.6164f }; Locations TwilightEggs[] = { - {3219.28f, 669.121f , 88.5549f}, - {3221.55f, 682.852f , 90.5361f}, - {3239.77f, 685.94f , 90.3168f}, - {3250.33f, 669.749f , 88.7637f}, - {3246.6f, 642.365f , 84.8752f}, - {3233.68f, 653.117f , 85.7051f} + {3219.28f, 669.121f, 88.5549f}, + {3221.55f, 682.852f, 90.5361f}, + {3239.77f, 685.94f, 90.3168f}, + {3250.33f, 669.749f, 88.7637f}, + {3246.6f, 642.365f, 84.8752f}, + {3233.68f, 653.117f, 85.7051f} }; Locations TwilightEggsSarth[] = { - {3252.73f, 515.762f , 58.5501f}, - {3256.56f, 521.119f , 58.6061f}, - {3255.63f, 527.513f , 58.7568f}, - {3264.90f, 525.865f , 58.6436f}, - {3264.26f, 516.364f , 58.8011f}, - {3257.54f, 502.285f , 58.2077f} + {3252.73f, 515.762f, 58.5501f}, + {3256.56f, 521.119f, 58.6061f}, + {3255.63f, 527.513f, 58.7568f}, + {3264.90f, 525.865f, 58.6436f}, + {3264.26f, 516.364f, 58.8011f}, + {3257.54f, 502.285f, 58.2077f} }; #define TWILIGHT_ACHIEVEMENTS 1 @@ -290,14 +290,14 @@ public: if (pTenebron) { pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); - if(pTenebron->isAlive()) + if (pTenebron->isAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTenebron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) + if (pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false) { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); @@ -308,14 +308,14 @@ public: if (pShadron) { pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); - if(pShadron->isAlive()) + if (pShadron->isAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pShadron->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) + if (pInstance->GetData(TYPE_SHADRON_PREKILLED) == false) { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); @@ -326,14 +326,14 @@ public: if (pVesperon) { pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); - if(pVesperon->isAlive()) + if (pVesperon->isAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pVesperon->GetMotionMaster()->MoveTargetedHome(); }else { - if(pInstance->GetData(TYPE_VESPERON_PREKILLED) == false) + if (pInstance->GetData(TYPE_VESPERON_PREKILLED) == false) { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); @@ -484,7 +484,7 @@ public: int32 iTextId = 0; - switch(pTemp->GetEntry()) + switch (pTemp->GetEntry()) { case NPC_TENEBRON: iTextId = SAY_SARTHARION_CALL_TENEBRON; @@ -532,13 +532,13 @@ public: Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(me, pFireCyclonesList, checker); me->VisitNearbyObject(200.0f, searcher); - if(pFireCyclonesList.empty()) + if (pFireCyclonesList.empty()) return; std::list<Creature*>::iterator itr = pFireCyclonesList.begin(); uint32 rnd = rand()%pFireCyclonesList.size(); - for(uint32 i = 0; i < rnd; ++i) + for (uint32 i = 0; i < rnd; ++i) ++itr; (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); @@ -586,13 +586,13 @@ public: if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); - switch(urand(0, 1)) + switch (urand(0, 1)) { case 0: { - Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y, FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y, FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y, FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -600,8 +600,8 @@ public: } case 1: { - Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); - Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y, FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature* Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y, FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; @@ -648,7 +648,7 @@ public: { CastLavaStrikeOnTarget(target); - if(urand(0, 5) == 0) + if (urand(0, 5) == 0) DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); } m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); @@ -780,7 +780,7 @@ struct dummy_dragonAI : public ScriptedAI { me->GetMotionMaster()->Clear(); me->SetInCombatWithZone(); - if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) { me->AddThreat(target, 1.0f); me->Attack(target, true); @@ -837,19 +837,19 @@ struct dummy_dragonAI : public ScriptedAI //in instance script and calculate range to each. GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_TENEBRON: { iTextId = WHISPER_HATCH_EGGS; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - for(uint32 i = 0; i < 6; ++i) + 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); } else { - for(uint32 i = 0; i < 6; ++i) + for (uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; @@ -857,10 +857,10 @@ struct dummy_dragonAI : public ScriptedAI case NPC_SHADRON: { iTextId = WHISPER_OPEN_PORTAL; - if(pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) - me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y , AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); + if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y, AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); else - me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y , AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); + me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y, AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000); break; } @@ -869,7 +869,7 @@ struct dummy_dragonAI : public ScriptedAI iTextId = WHISPER_OPEN_PORTAL; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y, AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -878,7 +878,7 @@ struct dummy_dragonAI : public ScriptedAI } else { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y, AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -909,20 +909,20 @@ struct dummy_dragonAI : public ScriptedAI int32 iTextId = 0; uint32 uiSpellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_TENEBRON: iTextId = SAY_TENEBRON_DEATH; uiSpellId = SPELL_POWER_OF_TENEBRON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_TENEBRON_PREKILLED, 1); break; case NPC_SHADRON: iTextId = SAY_SHADRON_DEATH; uiSpellId = SPELL_POWER_OF_SHADRON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_SHADRON_PREKILLED, 1); - if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) + if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f)) { pAcolyte->Kill(pAcolyte); } @@ -930,9 +930,9 @@ struct dummy_dragonAI : public ScriptedAI case NPC_VESPERON: iTextId = SAY_VESPERON_DEATH; uiSpellId = SPELL_POWER_OF_VESPERON; - if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) + if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS) pInstance->SetData(TYPE_VESPERON_PREKILLED, 1); - if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) + if (Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f)) { pAcolyte->Kill(pAcolyte); } @@ -967,7 +967,7 @@ struct dummy_dragonAI : public ScriptedAI { if (m_uiMoveNextTimer <= uiDiff) { - if(m_uiWaypointId < MAX_WAYPOINT) + if (m_uiWaypointId < MAX_WAYPOINT) me->GetMotionMaster()->MovePoint(m_uiWaypointId, m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ); @@ -1144,7 +1144,7 @@ public: // Portal Event if (m_uiAcolyteShadronTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteShadronTimer = 10000; else { @@ -1243,7 +1243,7 @@ public: // Portal Event if (m_uiAcolyteVesperonTimer <= uiDiff) { - if(m_bHasPortalOpen) + if (m_bHasPortalOpen) m_uiAcolyteVesperonTimer = 10000; else { @@ -1324,7 +1324,7 @@ public: if (pInstance) { Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); - if(Shadron) + if (Shadron) { (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } @@ -1364,7 +1364,7 @@ public: void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -1459,7 +1459,7 @@ public: void UpdateAI(const uint32 uiDiff) { - if(uiDespawnTimer < uiDiff) + if (uiDespawnTimer < uiDiff) { me->SetVisible(false); me->Kill(me); @@ -1504,7 +1504,7 @@ public: void Reset() { - if(pInstance) + if (pInstance) { me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } @@ -1533,7 +1533,7 @@ public: if (m_uiHatchEggTimer <= uiDiff) { Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); - if(Tenebron) + if (Tenebron) (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } @@ -1590,7 +1590,7 @@ public: Tsunami_Timer = 500; }else Tsunami_Timer -= diff; - if(TsunamiBuff_timer <= diff) + if (TsunamiBuff_timer <= diff) { if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); @@ -1625,8 +1625,8 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->AddAura( 46265 , me ); // Wrong, can't find proper visual - me->AddAura( 69422 , me ); + me->AddAura( 46265, me ); // Wrong, can't find proper visual + me->AddAura( 69422, me ); VoidBlast_Timer = 5000; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 4c973482784..671c6b8b6d1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -73,7 +73,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SARTHARION: m_uiSartharionGUID = creature->GetGUID(); @@ -99,11 +99,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) m_auiEncounter[0] = uiData; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) m_bTenebronKilled = true; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) m_bShadronKilled = true; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) m_bVesperonKilled = true; } @@ -111,11 +111,11 @@ public: { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; - else if(uiType == TYPE_TENEBRON_PREKILLED) + else if (uiType == TYPE_TENEBRON_PREKILLED) return m_bTenebronKilled; - else if(uiType == TYPE_SHADRON_PREKILLED) + else if (uiType == TYPE_SHADRON_PREKILLED) return m_bShadronKilled; - else if(uiType == TYPE_VESPERON_PREKILLED) + else if (uiType == TYPE_VESPERON_PREKILLED) return m_bVesperonKilled; return 0; @@ -123,7 +123,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_SARTHARION: return m_uiSartharionGUID; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 2558b03beb6..f602f41ce11 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -89,7 +89,7 @@ class boss_baltharus_the_warborn : public CreatureScript void DoAction(int32 const action) { - switch(action) + switch (action) { case ACTION_INTRO_BALTHARUS: if (_introDone) @@ -160,7 +160,7 @@ class boss_baltharus_the_warborn : public CreatureScript DoAction(ACTION_CLONE); } - if (me->GetHealth() - damage > 0) + if (me->GetHealth() > damage) instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } @@ -246,7 +246,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript void DamageTaken(Unit* /*attacker*/, uint32& damage) { // Setting DATA_BALTHARUS_SHARED_HEALTH to 0 when killed would bug the boss. - if (_instance && me->GetHealth() - damage > 0) + if (_instance && me->GetHealth() > damage) _instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 3a50838fff9..733af8553e0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -203,7 +203,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(ConflagrationTargetSelector()); + unitList.remove_if (ConflagrationTargetSelector()); uint8 maxSize = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 3); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 139e74ab67e..80a94b5b4fc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -78,7 +78,7 @@ class spell_eadric_radiance : public SpellScriptLoader PrepareSpellScript(spell_eadric_radiance_SpellScript); void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(OrientationCheck(GetCaster())); + unitList.remove_if (OrientationCheck(GetCaster())); } void Register() @@ -317,7 +317,7 @@ public: { me->InterruptNonMeleeSpells(true); uint8 uiTarget = urand(0, 1); - switch(uiTarget) + switch (uiTarget) { case 0: DoCast(me, SPELL_RENEW); @@ -451,7 +451,7 @@ public: { if (uiPoint == 0) { - switch(uiWaypoint) + switch (uiWaypoint) { case 0: me->SetOrientation(5.81f); @@ -470,10 +470,10 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_ARGENT_LIGHWIELDER: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 712.14f, 628.42f, 411.88f); @@ -487,7 +487,7 @@ public: } break; case NPC_ARGENT_MONK: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 713.12f, 632.97f, 411.90f); @@ -501,7 +501,7 @@ public: } break; case NPC_PRIESTESS: - switch(uiType) + switch (uiType) { case 0: AddWaypoint(0, 715.06f, 637.07f, 411.91f); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 426b41c3f02..55cfef0f160 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -169,7 +169,7 @@ public: } else uiResurrectTimer -= uiDiff; } - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: case PHASE_SKELETON: @@ -189,7 +189,7 @@ public: DoCastVictim(SPELL_OBLITERATE); uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: { @@ -273,7 +273,7 @@ public: me->SetHealth(0); me->AddUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); RemoveSummons(); - switch(uiPhase) + switch (uiPhase) { case PHASE_UNDEAD: me->SetDisplayId(MODEL_SKELETON); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 0c52039ea5d..50cd81ba1c7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -176,7 +176,7 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) { - switch(uiType) + switch (uiType) { case 1: AddWaypoint(0, 747.36f, 634.07f, 411.572f); @@ -205,7 +205,7 @@ public: void WaypointReached(uint32 i) { - switch(i) + switch (i) { case 2: if ((pInstance && uiWaypointPath == 3) || uiWaypointPath == 2) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 884da9fc119..415a82651ac 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -109,7 +109,7 @@ public: TeamInInstance = player->GetTeam(); } - switch(creature->GetEntry()) + switch (creature->GetEntry()) { // Champions case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: @@ -151,7 +151,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_MAIN_GATE: uiMainGateGUID = go->GetGUID(); @@ -165,7 +165,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case DATA_MOVEMENT_DONE: uiMovementDone = uiData; @@ -234,7 +234,7 @@ public: uint32 GetData(uint32 uiData) { - switch(uiData) + switch (uiData) { case BOSS_GRAND_CHAMPIONS: return m_auiEncounter[0]; case BOSS_ARGENT_CHALLENGE_E: return m_auiEncounter[1]; @@ -250,7 +250,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_ANNOUNCER: return uiAnnouncerGUID; case DATA_MAIN_GATE: return uiMainGateGUID; @@ -265,7 +265,7 @@ public: void SetData64(uint32 uiType, uint64 uiData) { - switch(uiType) + switch (uiType) { case DATA_GRAND_CHAMPION_1: uiGrandChampion1GUID = uiData; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index d7c486096bd..acbe54d0acd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -135,7 +135,7 @@ public: std::list<uint64> TempList; if (uiLesserChampions == 3 || uiLesserChampions == 6) { - switch(uiLesserChampions) + switch (uiLesserChampions) { case 3: TempList = Champion2List; @@ -187,7 +187,7 @@ public: ++uiSummonTimes; uint32 VEHICLE_TO_SUMMON1 = 0; uint32 VEHICLE_TO_SUMMON2 = 0; - switch(uiBoss) + switch (uiBoss) { case 0: VEHICLE_TO_SUMMON1 = VEHICLE_MOKRA_SKILLCRUSHER_MOUNT; @@ -215,7 +215,7 @@ public: if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: { @@ -223,8 +223,8 @@ public: uint64 uiGrandChampionBoss1 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle1GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss1 = pUnit->GetGUID(); + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss1 = unit->GetGUID(); if (pInstance) { pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); @@ -239,8 +239,8 @@ public: uint64 uiGrandChampionBoss2 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle2GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss2 = pUnit->GetGUID(); + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss2 = unit->GetGUID(); if (pInstance) { pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); @@ -255,8 +255,8 @@ public: uint64 uiGrandChampionBoss3 = 0; if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle3GUID)) if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss3 = pUnit->GetGUID(); + if (Unit* unit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss3 = unit->GetGUID(); if (pInstance) { pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); @@ -273,7 +273,7 @@ public: { if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { - switch(uiSummonTimes) + switch (uiSummonTimes) { case 1: Champion1List.push_back(pAdd->GetGUID()); @@ -286,7 +286,7 @@ public: break; } - switch(i) + switch (i) { case 0: pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); @@ -337,7 +337,7 @@ public: { uint8 uiTempBoss = urand(0, 1); - switch(uiTempBoss) + switch (uiTempBoss) { case 0: uiArgentChampion = NPC_EADRIC; @@ -406,7 +406,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoSummonGrandChampion(uiSecondBoss); @@ -443,7 +443,7 @@ public: void SummonedCreatureDespawn(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case VEHICLE_DARNASSIA_NIGHTSABER: case VEHICLE_EXODAR_ELEKK: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index f0c2ca635b2..bc35dad822e 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -104,7 +104,7 @@ enum BossSpells SPELL_SPIKE_TELE = 66170, }; -#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193,67856,67855,67857) +#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193, 67856, 67855, 67857) enum SummonActions { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index cf7b6868946..ff342db5503 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -64,7 +64,7 @@ public: { boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), Summons(me) { - m_pInstance = (InstanceScript* ) creature->GetInstanceScript(); + m_pInstance = (InstanceScript*) creature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -253,7 +253,7 @@ struct boss_faction_championsAI : public ScriptedAI { boss_faction_championsAI(Creature* creature, uint32 aitype) : ScriptedAI(creature) { - m_pInstance = (InstanceScript* ) creature->GetInstanceScript(); + m_pInstance = (InstanceScript*) creature->GetInstanceScript(); mAIType = aitype; } @@ -292,14 +292,14 @@ struct boss_faction_championsAI : public ScriptedAI std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = tList.begin(); itr != tList.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && me->getThreatManager().getThreat(pUnit)) + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && me->getThreatManager().getThreat(unit)) { - if (pUnit->GetTypeId()==TYPEID_PLAYER) + if (unit->GetTypeId()==TYPEID_PLAYER) { - float threat = CalculateThreat(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth()); - me->getThreatManager().modifyThreatPercent(pUnit, -100); - me->AddThreat(pUnit, 1000000.0f * threat); + float threat = CalculateThreat(me->GetDistance2d(unit), (float)unit->GetArmor(), unit->GetHealth()); + me->getThreatManager().modifyThreatPercent(unit, -100); + me->AddThreat(unit, 1000000.0f * threat); } } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 7d741cc3226..962ecdff83f 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -226,7 +226,7 @@ public: if (m_uiNetherPowerTimer <= uiDiff) { - me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5,10,5,10), me, true); + me->CastCustomSpell(SPELL_NETHER_POWER, SPELLVALUE_AURA_STACK, RAID_MODE<uint32>(5, 10, 5,10), me, true); m_uiNetherPowerTimer = 40*IN_MILLISECONDS; } else m_uiNetherPowerTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 51a125d8c79..4824c46deb7 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -158,7 +158,7 @@ public: void MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + switch (uiId) { case 0: @@ -661,11 +661,11 @@ public: submergeTimer = 45 * IN_MILLISECONDS; stage = 0; } - + void MovementInform(uint32 uiType, uint32 uiId) { if (uiType != POINT_MOTION_TYPE) return; - + switch (uiId) { case 0: @@ -689,7 +689,7 @@ public: instanceScript->DoUseDoorOrButton(instanceScript->GetData64(GO_MAIN_GATE_DOOR)); boss_jormungarAI::EnterEvadeMode(); } - + void JustReachedHome() { if (instanceScript) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index b9348e572ca..dff484a4933 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -81,8 +81,8 @@ enum BossSpells SPELL_DARK_ESSENCE = 65684, SPELL_EMPOWERED_DARK = 65724, SPELL_TWIN_EMPATHY_DARK = 66132, - SPELL_UNLEASHED_DARK = 65808, - + SPELL_UNLEASHED_DARK = 65808, + SPELL_CONTROLLER_PERIODIC = 66149, SPELL_POWER_TWINS = 65879, SPELL_BERSERK = 64238, @@ -408,7 +408,7 @@ public: { m_pInstance = (InstanceScript*)creature->GetInstanceScript(); } - + InstanceScript* m_pInstance; void Reset() { @@ -445,7 +445,7 @@ public: me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); boss_twin_baseAI::EnterCombat(who); } - + void EnterEvadeMode() { m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); @@ -727,10 +727,10 @@ class spell_powering_up : public SpellScriptLoader { if (pAura->GetStackAmount() == 100) { - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2206, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_DARK, true); - if(target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) + if (target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2845, EFFECT_1)) target->CastSpell(target, SPELL_EMPOWERED_LIGHT, true); target->RemoveAurasDueToSpell(GetId()); @@ -757,7 +757,7 @@ class spell_powering_up : public SpellScriptLoader uint32 spellId; - bool Validate(SpellEntry const* /*spellEntry*/) + bool Validate(SpellEntry const* /*spellEntry*/) { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -803,7 +803,7 @@ class spell_valkyr_essences : public SpellScriptLoader return true; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & /*absorbAmount*/) { if (urand(0, 99) < 5) GetTarget()->CastSpell(GetTarget(), spellId, true); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index dd772a14b5d..913484cbf77 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -559,7 +559,7 @@ class npc_tirion_toc : public CreatureScript if (m_pInstance->GetData(TYPE_BEASTS) != DONE) { m_pInstance->DoUseDoorOrButton(m_pInstance->GetData64(GO_MAIN_GATE_DOOR)); - + if (Creature* pTemp = me->SummonCreature(NPC_GORMOK, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30*IN_MILLISECONDS)) { pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); @@ -625,7 +625,7 @@ class npc_tirion_toc : public CreatureScript pTemp->GetMotionMaster()->MovePoint(2, ToCCommonLoc[5].GetPositionX(), ToCCommonLoc[5].GetPositionY(), ToCCommonLoc[5].GetPositionZ()); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); - + } } m_uiUpdateTimer = 5000; @@ -718,14 +718,14 @@ class npc_tirion_toc : public CreatureScript break; case 4010: DoScriptText(SAY_STAGE_3_02, me); - if(Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* pTemp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { pTemp->SetVisible(false); pTemp->SetReactState(REACT_PASSIVE); pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[0].GetPositionX(), TwinValkyrsLoc[0].GetPositionY(), TwinValkyrsLoc[0].GetPositionZ()); pTemp->SummonCreature(NPC_LIGHT_ESSENCE, TwinValkyrsLoc[1].GetPositionX(), TwinValkyrsLoc[1].GetPositionY(), TwinValkyrsLoc[1].GetPositionZ()); } - if(Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) + if (Creature* pTemp = me->SummonCreature(NPC_DARKBANE, ToCSpawnLoc[2].GetPositionX(), ToCSpawnLoc[2].GetPositionY(), ToCSpawnLoc[2].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME)) { pTemp->SetVisible(false); pTemp->SetReactState(REACT_PASSIVE); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 3dcc620c87a..48616d8e6e4 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -100,7 +100,7 @@ class boss_dred : public CreatureScript if (uiGrievousBiteTimer <= diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE , false); + DoCastVictim(SPELL_GRIEVOUS_BITE, false); uiGrievousBiteTimer = 20000; } else diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 6c4920f7744..c2217f0cb23 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -90,7 +90,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_NOVOS_CRYSTAL_1: uiNovosCrystal1 = go->GetGUID(); @@ -109,7 +109,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TROLLGORE: uiTrollgore = creature->GetGUID(); @@ -128,7 +128,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_TROLLGORE: return uiTrollgore; case DATA_NOVOS: return uiNovos; @@ -145,7 +145,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_TROLLGORE_EVENT: m_auiEncounter[0] = data; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 5c3249949b8..eacb800f15a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -143,7 +143,7 @@ class boss_bronjahm : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MAGIC_BANE: DoCastVictim(SPELL_MAGIC_S_BANE); @@ -377,7 +377,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { - unitList.remove_if(DistanceCheck(GetCaster())); + unitList.remove_if (DistanceCheck(GetCaster())); sharedUnitList = unitList; } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 51b240976c9..adbe59555b6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -261,7 +261,7 @@ class boss_devourer_of_souls : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_PHANTOM_BLAST: DoCastVictim(SPELL_PHANTOM_BLAST); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index e337050a5a2..9a37465fc1b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -173,7 +173,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -193,7 +193,7 @@ public: return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_SYLVANAS_INTRO_1, me); @@ -254,7 +254,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -299,7 +299,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_INTRO: { @@ -319,7 +319,7 @@ public: return; events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_INTRO_1: DoScriptText(SAY_JAINA_INTRO_1, me); @@ -391,7 +391,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -446,7 +446,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPITE: DoCastVictim(SPELL_SPITE); @@ -502,7 +502,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_VEIL_OF_SHADOWS: DoCastVictim(SPELL_VEIL_OF_SHADOWS); @@ -560,7 +560,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHROUD_OF_RUNES: DoCast(me, SPELL_SHROUD_OF_RUNES); @@ -617,7 +617,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FROST_NOVA: DoCast(me, SPELL_FROST_NOVA); @@ -677,7 +677,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BONE_VOLLEY: DoCastAOE(SPELL_BONE_VOLLEY); @@ -743,7 +743,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -816,7 +816,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_RAISE_DEAD: DoCast(me, SPELL_RAISE_DEAD); @@ -883,7 +883,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SOUL_STRIKE: DoCast(me->getVictim(), SPELL_SOUL_STRIKE); 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 f4bb4a9f72c..1f79f53ca86 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -230,7 +230,7 @@ public: void DoAction(const int32 actionId) { - switch(actionId) + switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_START_INTRO, 0); @@ -244,7 +244,7 @@ public: void UpdateAI(const uint32 diff) { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_START_INTRO: me->GetMotionMaster()->MovePoint(0, MoveThronePos); @@ -664,7 +664,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_WORD_PAIN: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -747,7 +747,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_FIREBALL: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) @@ -847,7 +847,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_STEP: DoCast(SPELL_SHADOW_STEP); @@ -917,7 +917,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPECTRAL_STRIKE: DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); @@ -983,7 +983,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHOOT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) 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 c34f64df816..6237d7d57b0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -104,7 +104,7 @@ struct boss_horAI : ScriptedAI void DoAction(const int32 actionID) { - switch(actionID) + switch (actionID) { case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat. // Just in case. Should have been done by InstanceScript @@ -114,8 +114,8 @@ struct boss_horAI : ScriptedAI me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); - if (Unit* pUnit = me->SelectNearestTarget()) - AttackStart(pUnit); + if (Unit* unit = me->SelectNearestTarget()) + AttackStart(unit); DoZoneInCombat(); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index f86acaf623a..8e7155603eb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -157,7 +157,7 @@ public: if (Player* player = players.begin()->getSource()) uiTeamInInstance = player->GetTeam(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_FALRIC: uiFalric = creature->GetGUID(); @@ -180,7 +180,7 @@ public: void OnGameObjectCreate(GameObject* go) { // TODO: init state depending on encounters - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); @@ -221,7 +221,7 @@ public: if (uiWaveCount && data == NOT_STARTED) DoWipe(); - switch(type) + switch (type) { case DATA_FALRIC_EVENT: uiEncounter[0] = data; @@ -244,7 +244,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_FALRIC_EVENT: return uiEncounter[0]; case DATA_MARWYN_EVENT: return uiEncounter[1]; @@ -258,7 +258,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_FALRIC: return uiFalric; case DATA_MARWYN: return uiMarwyn; @@ -320,7 +320,7 @@ public: DoUpdateWorldState(WORLD_STATE_HOR, 1); DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 1: case 2: @@ -407,7 +407,7 @@ public: events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_NEXT_WAVE: uiWaveCount++; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 2bf8876572f..29a89328336 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -162,7 +162,7 @@ class instance_pit_of_saron : public InstanceMapScript switch (type) { case DATA_GARFROST: - if(state == DONE) + if (state == DONE) { if (Creature* summoner = instance->GetCreature(_garfrostGUID)) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index fa573408d3c..034bfafe8b0 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -192,7 +192,7 @@ class mob_wrathbone_laborer : public CreatureScript while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BLINDING_DIRT: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true)) diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 945239cc594..690b0f0a35e 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -138,7 +138,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_SLAD_RAN: uiSladRan = creature->GetGUID(); break; case CREATURE_MOORABI: uiMoorabi = creature->GetGUID(); break; @@ -154,7 +154,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 192518: uiSladRanAltar = go->GetGUID(); @@ -253,7 +253,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: m_auiEncounter[0] = data; @@ -317,7 +317,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_EVENT: return m_auiEncounter[0]; @@ -338,7 +338,7 @@ public: uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_SLAD_RAN_ALTAR: return uiSladRanAltar; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 332c52f55b6..559c9ae6aa9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -657,7 +657,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { uint32 targetCount = (targets.size() + 2) / 3; - targets.remove_if(BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); + targets.remove_if (BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI()))); Trinity::RandomResizeList(targets, targetCount); // mark targets now, effect hook has missile travel time delay (might cast next in that time) for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) @@ -694,7 +694,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); bool remove = true; std::list<Unit*>::const_iterator itrEnd = unitList.end(), itr, itr2; @@ -780,7 +780,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); + unitList.remove_if (Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); unitList.push_back(GetCaster()); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index cb7c25e152b..4703e827522 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -719,7 +719,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript float x, y, z; deathbringer->GetClosePoint(x, y, z, deathbringer->GetObjectSize()); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(POINT_CORPSE , x, y, z); + me->GetMotionMaster()->MovePoint(POINT_CORPSE, x, y, z); } break; case EVENT_OUTRO_HORDE_5: // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index b19042b3669..a52965f925f 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -193,9 +193,9 @@ class boss_lord_marrowgar : public CreatureScript case EVENT_BONE_STORM_MOVE: { events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)); if (!unit) - unit = SelectTarget(SELECT_TARGET_RANDOM, 0); + unit = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); if (unit) me->GetMotionMaster()->MovePoint(POINT_TARGET_BONESTORM_PLAYER, unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ()); break; @@ -564,14 +564,14 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_storm_SpellScript); - void RecalculateDamage(SpellEffIndex /*effIndex*/) + void RecalculateDamage() { - SetHitDamage(int32(GetHitDamage() / sqrtf(logf(GetHitUnit()->GetExactDist2d(GetCaster()))))); + SetHitDamage(int32(GetHitDamage() / std::max(sqrtf(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); } void Register() { - OnEffectHitTarget += SpellEffectFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnHit += SpellHitFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 72b5f8f918c..a6e3e78c96a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -525,7 +525,7 @@ class boss_professor_putricide : public CreatureScript EnterEvadeMode(); break; case EVENT_FESTERGUT_GOO: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_MALLABLE_GOO_H, true); // triggered, to skip LoS check events.ScheduleEvent(EVENT_FESTERGUT_GOO, urand(15000, 20000), 0, PHASE_FESTERGUT); break; @@ -534,7 +534,7 @@ class boss_professor_putricide : public CreatureScript EnterEvadeMode(); break; case EVENT_ROTFACE_VILE_GAS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_VILE_GAS_H, true); // triggered, to skip LoS check events.ScheduleEvent(EVENT_ROTFACE_VILE_GAS, urand(15000, 20000), 0, PHASE_ROTFACE); break; @@ -601,7 +601,7 @@ class boss_professor_putricide : public CreatureScript events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, urand(35000, 40000)); break; case EVENT_UNBOUND_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) { me->CastCustomSpell(SPELL_UNBOUND_PLAGUE, SPELLVALUE_BASE_POINT0, 775, target); DoCast(target, SPELL_UNBOUND_PLAGUE_SEARCHER); @@ -1341,18 +1341,18 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader if (!summon || !summon->IsVehicle()) return; - caster->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_NAME, true); summon->CastSpell(summon, SPELL_ABOMINATION_VEHICLE_POWER_DRAIN, true); summon->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_DAMAGE, true); + caster->CastSpell(summon, SPELL_MUTATED_TRANSFORMATION_NAME, true); - caster->EnterVehicle(summon, 0); + caster->EnterVehicle(summon, 0); // VEHICLE_SPELL_RIDE_HARDCODED is used according to sniff, this is ok summon->SetCreatorGUID(caster->GetGUID()); putricide->AI()->JustSummoned(summon); } void Register() { - OnEffectHitTarget += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 24738fe0155..58ae5f48797 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -490,7 +490,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { // remove targets with this aura already // tank is not on this list - targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + targets.remove_if (Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 65edd4cca37..dca53f1a5e7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1020,7 +1020,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(UnchainedMagicTargetSelector()); + unitList.remove_if (UnchainedMagicTargetSelector()); uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 5 : 2); if (unitList.size() > maxSize) Trinity::RandomResizeList(unitList, maxSize); @@ -1214,7 +1214,7 @@ class spell_sindragosa_collision_filter : public SpellScriptLoader { std::list<Creature*> tombs; GetCreatureListWithEntryInGrid(tombs, GetCaster(), NPC_ICE_TOMB, 200.0f); - unitList.remove_if(FrostBombTargetSelector(GetCaster(), tombs)); + unitList.remove_if (FrostBombTargetSelector(GetCaster(), tombs)); } void Register() @@ -1353,7 +1353,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader std::list<Creature*> unitList; GetCreatureListWithEntryInGrid(unitList, GetCaster(), NPC_FROSTWING_WHELP, 150.0f); if (Creature* creature = GetCaster()->ToCreature()) - unitList.remove_if(OrderWhelpTargetSelector(creature)); + unitList.remove_if (OrderWhelpTargetSelector(creature)); SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp new file mode 100644 index 00000000000..85ab188f336 --- /dev/null +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -0,0 +1,3243 @@ +/* + * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "ObjectMgr.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" +#include "Spell.h" +#include "Vehicle.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "icecrown_citadel.h" + +enum Texts +{ + // The Lich King + SAY_LK_INTRO_1 = 0, + SAY_LK_INTRO_2 = 1, + SAY_LK_INTRO_3 = 2, + SAY_LK_REMORSELESS_WINTER = 4, + SAY_LK_QUAKE = 5, + SAY_LK_SUMMON_VALKYR = 6, + SAY_LK_HARVEST_SOUL = 7, + SAY_LK_FROSTMOURNE_ESCAPE = 8, // not said on heroic + SAY_LK_FROSTMOURNE_KILL = 9, // not said on heroic + SAY_LK_KILL = 10, + SAY_LK_BERSERK = 11, + EMOTE_DEFILE_WARNING = 12, + EMOTE_NECROTIC_PLAGUE_WARNING = 13, + SAY_LK_OUTRO_1 = 14, + SAY_LK_OUTRO_2 = 15, + SAY_LK_OUTRO_3 = 16, + SAY_LK_OUTRO_4 = 17, + SAY_LK_OUTRO_5 = 18, + SAY_LK_OUTRO_6 = 19, + SAY_LK_OUTRO_7 = 20, + SAY_LK_OUTRO_8 = 21, + + // Highlord Tirion Fordring + SAY_TIRION_INTRO_1 = 0, + SAY_TIRION_INTRO_2 = 1, + SAY_TIRION_OUTRO_1 = 2, + SAY_TIRION_OUTRO_2 = 3, + + // Terenas Menethil (outro) + SAY_TERENAS_OUTRO_1 = 0, + SAY_TERENAS_OUTRO_2 = 1, + + // Terenas Menethil (Frostmourne) + SAY_TERENAS_INTRO_1 = 0, + SAY_TERENAS_INTRO_2 = 1, + SAY_TERENAS_INTRO_3 = 2, +}; + +enum Spells +{ + // The Lich King + SPELL_PLAGUE_AVOIDANCE = 72846, // raging spirits also get it + SPELL_EMOTE_SIT_NO_SHEATH = 73220, + SPELL_BOSS_HITTIN_YA = 73878, + SPELL_EMOTE_SHOUT_NO_SHEATH = 73213, + SPELL_ICE_LOCK = 71614, + + // Phase 1 + SPELL_SUMMON_SHAMBLING_HORROR = 70372, + SPELL_RISEN_WITCH_DOCTOR_SPAWN = 69639, + SPELL_SUMMON_DRUDGE_GHOULS = 70358, + SPELL_INFEST = 70541, + SPELL_NECROTIC_PLAGUE = 70337, + SPELL_NECROTIC_PLAGUE_JUMP = 70338, + SPELL_PLAGUE_SIPHON = 74074, + SPELL_SHADOW_TRAP = 73539, + SPELL_SHADOW_TRAP_AURA = 73525, + SPELL_SHADOW_TRAP_KNOCKBACK = 73529, + + // Phase Transition + SPELL_REMORSELESS_WINTER_1 = 68981, + SPELL_REMORSELESS_WINTER_2 = 72259, + SPELL_PAIN_AND_SUFFERING = 72133, + SPELL_SUMMON_ICE_SPHERE = 69104, + SPELL_ICE_SPHERE = 69090, + SPELL_ICE_BURST_TARGET_SEARCH = 69109, + SPELL_ICE_PULSE = 69091, + SPELL_ICE_BURST = 69108, + SPELL_RAGING_SPIRIT = 69200, + SPELL_RAGING_SPIRIT_VISUAL = 69197, + SPELL_RAGING_SPIRIT_VISUAL_CLONE = 69198, + SPELL_SOUL_SHRIEK = 69242, + SPELL_QUAKE = 72262, + + // Phase 2 + SPELL_DEFILE = 72762, + SPELL_DEFILE_AURA = 72743, + SPELL_DEFILE_GROW = 72756, + SPELL_SUMMON_VALKYR = 69037, + SPELL_SUMMON_VALKYR_PERIODIC = 74361, + SPELL_HARVEST_SOUL_VALKYR = 68985, // Val'kyr Shadowguard vehicle aura + SPELL_SOUL_REAPER = 69409, + SPELL_SOUL_REAPER_BUFF = 69410, + SPELL_WINGS_OF_THE_DAMNED = 74352, + SPELL_VALKYR_TARGET_SEARCH = 69030, + SPELL_CHARGE = 74399, // cast on selected target + SPELL_VALKYR_CARRY = 74445, // removes unselectable flag + SPELL_LIFE_SIPHON = 73488, + SPELL_LIFE_SIPHON_HEAL = 73489, + SPELL_EJECT_ALL_PASSENGERS = 68576, + + // Phase 3 + SPELL_VILE_SPIRITS = 70498, + SPELL_VILE_SPIRIT_MOVE_SEARCH = 70501, + SPELL_VILE_SPIRIT_DAMAGE_SEARCH = 70502, + SPELL_SPIRIT_BURST = 70503, + SPELL_HARVEST_SOUL = 68980, + SPELL_HARVEST_SOULS = 73654, // Heroic version, weird because it has all 4 difficulties just like above spell + SPELL_HARVEST_SOUL_VEHICLE = 68984, + SPELL_HARVEST_SOUL_VISUAL = 71372, + SPELL_HARVEST_SOUL_TELEPORT = 72546, + SPELL_HARVEST_SOULS_TELEPORT = 73655, + SPELL_HARVEST_SOUL_TELEPORT_BACK = 72597, + SPELL_IN_FROSTMOURNE_ROOM = 74276, + SPELL_KILL_FROSTMOURNE_PLAYERS = 75127, + SPELL_HARVESTED_SOUL = 72679, + SPELL_TRIGGER_VILE_SPIRIT_HEROIC = 73582, + + // Frostmourne + SPELL_LIGHTS_FAVOR = 69382, + SPELL_RESTORE_SOUL = 72595, + SPELL_RESTORE_SOULS = 73650, // Heroic + SPELL_DARK_HUNGER = 69383, // Passive proc healing + SPELL_DESTROY_SOUL = 74086, // Used when Terenas Menethil dies + SPELL_SOUL_RIP = 69397, // Deals increasing damage + SPELL_SOUL_RIP_DAMAGE = 69398, + SPELL_TERENAS_LOSES_INSIDE = 72572, + SPELL_SUMMON_SPIRIT_BOMB_1 = 73581, // (Heroic) + SPELL_SUMMON_SPIRIT_BOMB_2 = 74299, // (Heroic) + SPELL_EXPLOSION = 73576, // Spirit Bomb (Heroic) + + // Outro + SPELL_FURY_OF_FROSTMOURNE = 72350, + SPELL_FURY_OF_FROSTMOURNE_NO_REZ = 72351, + SPELL_EMOTE_QUESTION_NO_SHEATH = 73330, + SPELL_RAISE_DEAD = 71769, + SPELL_LIGHTS_BLESSING = 71797, + SPELL_JUMP = 71809, + SPELL_JUMP_TRIGGERED = 71811, + SPELL_JUMP_2 = 72431, + SPELL_SUMMON_BROKEN_FROSTMOURNE = 74081, // visual + SPELL_SUMMON_BROKEN_FROSTMOURNE_2 = 72406, // animation + SPELL_SUMMON_BROKEN_FROSTMOURNE_3 = 73017, // real summon + SPELL_BROKEN_FROSTMOURNE = 72398, + SPELL_BROKEN_FROSTMOURNE_KNOCK = 72405, + SPELL_SOUL_BARRAGE = 72305, + SPELL_SUMMON_TERENAS = 72420, + SPELL_MASS_RESURRECTION = 72429, + SPELL_MASS_RESURRECTION_REAL = 72423, + SPELL_PLAY_MOVIE = 73159, + + // Shambling Horror + SPELL_SHOCKWAVE = 72149, + SPELL_ENRAGE = 72143, + SPELL_FRENZY = 28747, +}; + +#define NECROTIC_PLAGUE_LK RAID_MODE<uint32>(70337, 73912, 73913, 73914) +#define NECROTIC_PLAGUE_PLR RAID_MODE<uint32>(70338, 73785, 73786, 73787) +#define REMORSELESS_WINTER_1 RAID_MODE<uint32>(68981, 74270, 74271, 74272) +#define REMORSELESS_WINTER_2 RAID_MODE<uint32>(72259, 74273, 74274, 74275) +#define SUMMON_VALKYR RAID_MODE<uint32>(69037, 74361, 69037, 74361) +#define HARVEST_SOUL RAID_MODE<uint32>(68980, 74325, 74296, 74297) + +enum Events +{ + // The Lich King + // intro events + EVENT_INTRO_MOVE_1 = 1, + EVENT_INTRO_MOVE_2 = 2, + EVENT_INTRO_MOVE_3 = 3, + EVENT_INTRO_TALK_1 = 4, + EVENT_EMOTE_CAST_SHOUT = 5, + EVENT_INTRO_EMOTE_1 = 6, + EVENT_INTRO_CHARGE = 7, + EVENT_INTRO_CAST_FREEZE = 8, + EVENT_FINISH_INTRO = 9, + + // combat events + EVENT_SUMMON_SHAMBLING_HORROR = 10, + EVENT_SUMMON_DRUDGE_GHOUL = 11, + EVENT_INFEST = 12, + EVENT_NECROTIC_PLAGUE = 13, + EVENT_SHADOW_TRAP = 14, // heroic only + EVENT_SOUL_REAPER = 15, + EVENT_DEFILE = 16, + EVENT_HARVEST_SOUL = 17, // normal mode only + EVENT_PAIN_AND_SUFFERING = 18, + EVENT_SUMMON_ICE_SPHERE = 19, + EVENT_SUMMON_RAGING_SPIRIT = 20, + EVENT_QUAKE = 21, + EVENT_SUMMON_VALKYR = 22, + EVENT_GRAB_PLAYER = 23, + EVENT_MOVE_TO_DROP_POS = 24, + EVENT_LIFE_SIPHON = 25, // heroic only + EVENT_START_ATTACK = 26, + EVENT_QUAKE_2 = 27, + EVENT_VILE_SPIRITS = 28, + EVENT_HARVEST_SOULS = 29, // heroic only + EVENT_WICKED_SPIRITS = 30, + EVENT_SOUL_RIP = 31, + EVENT_DESTROY_SOUL = 32, + EVENT_FROSTMOURNE_TALK_1 = 33, + EVENT_FROSTMOURNE_TALK_2 = 34, + EVENT_FROSTMOURNE_TALK_3 = 35, + EVENT_TELEPORT_BACK = 36, + EVENT_FROSTMOURNE_HEROIC = 37, + EVENT_OUTRO_TALK_1 = 38, + EVENT_OUTRO_TALK_2 = 39, + EVENT_OUTRO_EMOTE_TALK = 40, + EVENT_OUTRO_TALK_3 = 41, + EVENT_OUTRO_MOVE_CENTER = 42, + EVENT_OUTRO_TALK_4 = 43, + EVENT_OUTRO_RAISE_DEAD = 44, + EVENT_OUTRO_TALK_5 = 45, + EVENT_OUTRO_BLESS = 46, + EVENT_OUTRO_REMOVE_ICE = 47, + EVENT_OUTRO_MOVE_1 = 48, + EVENT_OUTRO_JUMP = 49, + EVENT_OUTRO_TALK_6 = 50, + EVENT_OUTRO_KNOCK_BACK = 51, + EVENT_OUTRO_SOUL_BARRAGE = 52, + EVENT_OUTRO_SUMMON_TERENAS = 53, + EVENT_OUTRO_TERENAS_TALK_1 = 54, + EVENT_OUTRO_TERENAS_TALK_2 = 55, + EVENT_OUTRO_TALK_7 = 56, + EVENT_OUTRO_TALK_8 = 57, + EVENT_BERSERK = 58, + + // Shambling Horror + EVENT_SHOCKWAVE = 59, + EVENT_ENRAGE = 60, + + // Raging Spirit + EVENT_SOUL_SHRIEK = 61, + + // Strangulate Vehicle (Harvest Soul) + EVENT_TELEPORT = 62, + EVENT_MOVE_TO_LICH_KING = 63, + EVENT_DESPAWN_SELF = 64, +}; + +enum EventGroups +{ + EVENT_GROUP_BERSERK = 1, + EVENT_GROUP_VILE_SPIRITS = 2, +}; + +enum Phases +{ + PHASE_INTRO = 1, + PHASE_ONE = 2, + PHASE_TWO = 3, + PHASE_THREE = 4, + PHASE_TRANSITION = 5, + PHASE_FROSTMOURNE = 6, // only set on heroic mode when all players are sent into frostmourne + PHASE_OUTRO = 7, + + PHASE_MASK_INTRO = 1 << PHASE_INTRO, + PHASE_MASK_ONE = 1 << PHASE_ONE, + PHASE_MASK_TWO = 1 << PHASE_TWO, + PHASE_MASK_THREE = 1 << PHASE_THREE, + PHASE_MASK_TRANSITION = 1 << PHASE_TRANSITION, + PHASE_MASK_NO_CAST_CHECK = (1 << PHASE_TRANSITION) | (1 << PHASE_FROSTMOURNE) | (1 << PHASE_OUTRO), + PHASE_MASK_FROSTMOURNE = 1 << PHASE_FROSTMOURNE, + PHASE_MASK_OUTRO = 1 << PHASE_OUTRO, + PHASE_MASK_NO_VICTIM = (1 << PHASE_INTRO) | (1 << PHASE_OUTRO) | (1 << PHASE_FROSTMOURNE), +}; + +#define PHASE_TWO_THREE (events.GetPhaseMask() & PHASE_MASK_TWO ? PHASE_TWO : PHASE_THREE) + +Position const CenterPosition = {503.6282f, -2124.655f, 840.8569f, 0.0f}; +Position const TirionIntro = {489.2970f, -2124.840f, 840.8569f, 0.0f}; +Position const TirionCharge = {482.9019f, -2124.479f, 840.8570f, 0.0f}; +Position const LichKingIntro[3] = +{ + {432.0851f, -2123.673f, 864.6582f, 0.0f}, + {457.8351f, -2123.423f, 841.1582f, 0.0f}, + {465.0730f, -2123.470f, 840.8569f, 0.0f}, +}; +Position const OutroPosition1 = {493.6286f, -2124.569f, 840.8569f, 0.0f}; +Position const OutroFlying = {508.9897f, -2124.561f, 845.3565f, 0.0f}; +Position const TerenasSpawn = {495.5542f, -2517.012f, 1050.000f, 4.6993f}; +Position const TerenasSpawnHeroic = {495.7080f, -2523.760f, 1050.000f, 0.0f}; +Position const SpiritWardenSpawn = {495.3406f, -2529.983f, 1050.000f, 1.5592f}; + +enum MovePoints +{ + POINT_CENTER_1 = 1, + POINT_CENTER_2 = 2, + POINT_TIRION_INTRO = 3, + POINT_LK_INTRO_1 = 4, + POINT_LK_INTRO_2 = 5, + POINT_LK_INTRO_3 = 6, + POINT_TIRION_CHARGE = 7, + POINT_DROP_PLAYER = 8, + POINT_LK_OUTRO_1 = 9, + POINT_TIRION_OUTRO_1 = 10, + POINT_OUTRO_JUMP = 11, + POINT_LK_OUTRO_2 = 12, + POINT_GROUND = 13, + POINT_CHARGE = 1003, // globally used number for charge spell effects +}; + +enum EncounterActions +{ + ACTION_START_ENCOUNTER = 0, + ACTION_CONTINUE_INTRO = 1, + ACTION_START_ATTACK = 2, + ACTION_OUTRO = 3, + ACTION_PLAY_MUSIC = 4, + ACTION_BREAK_FROSTMOURNE = 5, + ACTION_SUMMON_TERENAS = 6, + ACTION_FINISH_OUTRO = 7, + ACTION_TELEPORT_BACK = 8, +}; + +enum MiscData +{ + LIGHT_SNOWSTORM = 2490, + LIGHT_SOULSTORM = 2508, + + MUSIC_FROZEN_THRONE = 17457, + MUSIC_SPECIAL = 17458, // Summon Shambling Horror, Remorseless Winter, Quake, Summon Val'kyr Periodic, Harvest Soul, Vile Spirits + MUSIC_FURY_OF_FROSTMOURNE = 17459, + MUSIC_FINAL = 17460, // Raise Dead, Light's Blessing + + SOUND_PAIN = 17360, // separate sound, not attached to any text + + EQUIP_ASHBRINGER_GLOWING = 50442, + EQUIP_BROKEN_FROSTMOURNE = 50840, + + MOVIE_FALL_OF_THE_LICH_KING = 16, +}; + +#define DATA_PLAGUE_STACK 70337 +#define DATA_VILE 45814622 + +class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> +{ + public: + NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1 = 0, uint32 notAura2 = 0) + : _sourceObj(obj), _notAura1(notAura1), _notAura2(notAura2) + { + } + + bool operator()(Unit* unit) const + { + if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->isTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) + return false; + if ((_notAura1 && unit->HasAura(_notAura1)) || (_notAura2 && unit->HasAura(_notAura2))) + return false; + return true; + } + + private: + Unit const* _sourceObj; + uint32 _notAura1; + uint32 _notAura2; +}; + +class HeightDifferenceCheck +{ + public: + HeightDifferenceCheck(GameObject* go, float diff, bool reverse) + : _baseObject(go), _difference(diff), _reverse(reverse) + { + } + + bool operator()(Unit* unit) const + { + return (unit->GetPositionZ() - _baseObject->GetPositionZ() > _difference) != _reverse; + } + + private: + GameObject* _baseObject; + float _difference; + bool _reverse; +}; + +class FrozenThroneResetWorker +{ + public: + FrozenThroneResetWorker() { } + + bool operator()(GameObject* go) + { + switch (go->GetEntry()) + { + case GO_ARTHAS_PLATFORM: + go->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01: + go->SetGoState(GO_STATE_ACTIVE); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01: + go->SetGoState(GO_STATE_READY); + break; + case GO_DOODAD_ICESHARD_STANDING02: + case GO_DOODAD_ICESHARD_STANDING01: + case GO_DOODAD_ICESHARD_STANDING03: + case GO_DOODAD_ICESHARD_STANDING04: + go->ResetDoorOrButton(); + break; + default: + break; + } + + return false; + } +}; + +class StartMovementEvent : public BasicEvent +{ + public: + StartMovementEvent(Creature* summoner, Creature* owner) + : _summoner(summoner), _owner(owner) + { + } + + bool Execute(uint64 /*time*/, uint32 /*diff*/) + { + _owner->SetReactState(REACT_AGGRESSIVE); + if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(_summoner))) + _owner->AI()->AttackStart(target); + return true; + } + + private: + Creature* _summoner; + Creature* _owner; +}; + +class VileSpiritActivateEvent : public BasicEvent +{ + public: + explicit VileSpiritActivateEvent(Creature* owner) + : _owner(owner) + { + } + + bool Execute(uint64 /*time*/, uint32 /*diff*/) + { + _owner->SetReactState(REACT_AGGRESSIVE); + _owner->CastSpell(_owner, SPELL_VILE_SPIRIT_MOVE_SEARCH, true); + _owner->CastSpell((Unit*)NULL, SPELL_VILE_SPIRIT_DAMAGE_SEARCH, true); + return true; + } + + private: + Creature* _owner; +}; + +class boss_the_lich_king : public CreatureScript +{ + public: + boss_the_lich_king() : CreatureScript("boss_the_lich_king") { } + + struct boss_the_lich_kingAI : public BossAI + { + boss_the_lich_kingAI(Creature* creature) : BossAI(creature, DATA_THE_LICH_KING) + { + } + + void Reset() + { + _Reset(); + me->SetReactState(REACT_PASSIVE); + events.SetPhase(PHASE_INTRO); + _necroticPlagueStack = 0; + _vileSpiritExplosions = 0; + SetEquipmentSlots(true); + } + + void JustDied(Unit* /*killer*/) + { + _JustDied(); + DoCastAOE(SPELL_PLAY_MOVIE, false); + me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + float x, y, z; + me->GetPosition(x, y, z); + // use larger distance for vmap height search than in most other cases + float ground_Z = me->GetMap()->GetHeight(x, y, z, true, MAX_FALL_DISTANCE); + if (fabs(ground_Z - z) < 0.1f) + return; + + me->GetMotionMaster()->MoveFall(ground_Z); + } + + void EnterCombat(Unit* target) + { + if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer())) + { + EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); + return; + } + + me->setActive(true); + DoZoneInCombat(); + + events.SetPhase(PHASE_ONE); + events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 20000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 10000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_INFEST, 5000, 0, PHASE_ONE); + events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE); + events.ScheduleEvent(EVENT_BERSERK, 900000, EVENT_GROUP_BERSERK); + if (IsHeroic()) + events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); + } + + void JustReachedHome() + { + _JustReachedHome(); + instance->SetBossState(DATA_THE_LICH_KING, NOT_STARTED); + + // Reset The Frozen Throne gameobjects + FrozenThroneResetWorker reset; + Trinity::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset); + me->VisitNearbyGridObject(333.0f, worker); + + // Reset any light override + SendLightOverride(0, 5000); + } + + bool CanAIAttack(Unit const* target) const + { + // The Lich King must not select targets in frostmourne room if he killed everyone outside + return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM); + } + + void EnterEvadeMode() + { + instance->SetBossState(DATA_THE_LICH_KING, FAIL); + BossAI::EnterEvadeMode(); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->EnterEvadeMode(); + DoCastAOE(SPELL_KILL_FROSTMOURNE_PLAYERS); + summons.DoAction(NPC_STRANGULATE_VEHICLE, ACTION_TELEPORT_BACK); + } + + void KilledUnit(Unit* victim) + { + if (victim->GetTypeId() == TYPEID_PLAYER && !me->IsInEvadeMode() && !(events.GetPhaseMask() & PHASE_MASK_OUTRO)) + Talk(SAY_LK_KILL); + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_START_ENCOUNTER: + instance->SetBossState(DATA_THE_LICH_KING, IN_PROGRESS); + Talk(SAY_LK_INTRO_1); + SendMusicToPlayers(MUSIC_FROZEN_THRONE); + // schedule talks + me->SetStandState(UNIT_STAND_STATE_STAND); + events.ScheduleEvent(EVENT_INTRO_MOVE_1, 4000); + break; + case ACTION_START_ATTACK: + events.ScheduleEvent(EVENT_START_ATTACK, 5000); + break; + case ACTION_PLAY_MUSIC: + SendMusicToPlayers(MUSIC_FINAL); + break; + case ACTION_RESTORE_LIGHT: + SendLightOverride(0, 5000); + break; + case ACTION_BREAK_FROSTMOURNE: + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE); + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_2); + SetEquipmentSlots(false, EQUIP_BROKEN_FROSTMOURNE); + events.ScheduleEvent(EVENT_OUTRO_TALK_6, 2500, 0, PHASE_OUTRO); + break; + case ACTION_FINISH_OUTRO: + events.ScheduleEvent(EVENT_OUTRO_TALK_7, 7000, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_8, 17000, 0, PHASE_OUTRO); + break; + case ACTION_TELEPORT_BACK: + summons.DoAction(NPC_STRANGULATE_VEHICLE, ACTION_TELEPORT_BACK); + if (!IsHeroic()) + Talk(SAY_LK_FROSTMOURNE_ESCAPE); + else + DoCastAOE(SPELL_TRIGGER_VILE_SPIRIT_HEROIC); + break; + default: + break; + } + } + + uint32 GetData(uint32 type) + { + switch (type) + { + case DATA_PLAGUE_STACK: + return _necroticPlagueStack; + case DATA_VILE: + return _vileSpiritExplosions; + default: + break; + } + + return 0; + } + + void SetData(uint32 type, uint32 value) + { + switch (type) + { + case DATA_PLAGUE_STACK: + _necroticPlagueStack = std::max(value, _necroticPlagueStack); + break; + case DATA_VILE: + _vileSpiritExplosions += value; + break; + default: + break; + } + } + + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + { + if (events.GetPhaseMask() & PHASE_MASK_ONE && !HealthAbovePct(70)) + { + events.SetPhase(PHASE_TRANSITION); + me->GetMotionMaster()->MovePoint(POINT_CENTER_1, CenterPosition); + return; + } + + if (events.GetPhaseMask() & PHASE_MASK_TWO && !HealthAbovePct(40)) + { + events.SetPhase(PHASE_TRANSITION); + me->GetMotionMaster()->MovePoint(POINT_CENTER_2, CenterPosition); + return; + } + + if (events.GetPhaseMask() & PHASE_MASK_THREE && !HealthAbovePct(10)) + { + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + events.Reset(); + events.SetPhase(PHASE_OUTRO); + summons.DespawnAll(); + SendMusicToPlayers(MUSIC_FURY_OF_FROSTMOURNE); + DoCastAOE(SPELL_FURY_OF_FROSTMOURNE); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + events.ScheduleEvent(EVENT_OUTRO_TALK_1, 2600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 6600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 17600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 27600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_2, 34600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_3, 43600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 54600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 58600, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_MOVE_CENTER, 69600, 0, PHASE_OUTRO); + // stop here. rest will get scheduled from MovementInform + return; + } + } + + void JustSummoned(Creature* summon) + { + switch (summon->GetEntry()) + { + case NPC_SHAMBLING_HORROR: + case NPC_DRUDGE_GHOUL: + summon->CastSpell(summon, SPELL_RISEN_WITCH_DOCTOR_SPAWN, true); + summon->SetReactState(REACT_PASSIVE); + summon->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE); + summon->m_Events.AddEvent(new StartMovementEvent(me, summon), summon->m_Events.CalculateTime(5000)); + break; + case NPC_ICE_SPHERE: + { + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + { + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell(summon, SPELL_ICE_SPHERE, false); + summon->CastSpell(summon, SPELL_ICE_BURST_TARGET_SEARCH, false); + summon->CastSpell(target, SPELL_ICE_PULSE, false); + summon->ClearUnitState(UNIT_STAT_CASTING); + summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); + } + else + summon->DespawnOrUnsummon(); + break; + } + case NPC_DEFILE: + summon->SetReactState(REACT_PASSIVE); + summon->CastSpell(summon, SPELL_DEFILE_AURA, false); + break; + case NPC_VALKYR_SHADOWGUARD: + summon->CastSpell(summon, SPELL_WINGS_OF_THE_DAMNED, true); + summon->CastSpell(summon, SPELL_VALKYR_TARGET_SEARCH, true); + break; + case NPC_FROSTMOURNE_TRIGGER: + { + summons.Summon(summon); + summon->CastSpell((Unit*)NULL, SPELL_BROKEN_FROSTMOURNE, true); + + SendLightOverride(LIGHT_SOULSTORM, 10000); + SendWeather(WEATHER_STATE_BLACKSNOW); + + events.ScheduleEvent(EVENT_OUTRO_SOUL_BARRAGE, 5000, 0, PHASE_OUTRO); + return; + } + case NPC_VILE_SPIRIT: + { + summons.Summon(summon); + if (events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE) + { + TeleportSpirit(summon); + return; + } + + summon->SetReactState(REACT_PASSIVE); + summon->SetSpeed(MOVE_FLIGHT, 0.5f); + summon->GetMotionMaster()->MoveRandom(10.0f); + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(15000)); + return; + } + case NPC_STRANGULATE_VEHICLE: + summons.Summon(summon); + return; + default: + break; + } + + BossAI::JustSummoned(summon); + } + + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + { + switch (summon->GetEntry()) + { + case NPC_SHAMBLING_HORROR: + case NPC_DRUDGE_GHOUL: + case NPC_ICE_SPHERE: + case NPC_VALKYR_SHADOWGUARD: + case NPC_RAGING_SPIRIT: + case NPC_VILE_SPIRIT: + case NPC_WICKED_SPIRIT: + summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); + break; + default: + break; + } + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_HARVESTED_SOUL && me->isInCombat() && !IsHeroic()) + Talk(SAY_LK_FROSTMOURNE_KILL); + } + + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + { + if (spell->Id == REMORSELESS_WINTER_1 || spell->Id == REMORSELESS_WINTER_2) + { + SendLightOverride(LIGHT_SNOWSTORM, 5000); + SendWeather(WEATHER_STATE_LIGHT_SNOW); + } + } + + void MovementInform(uint32 type, uint32 pointId) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (pointId) + { + case POINT_LK_INTRO_1: + // schedule for next update cycle, current update must finalize movement + events.ScheduleEvent(EVENT_INTRO_MOVE_2, 1, 0, PHASE_INTRO); + break; + case POINT_LK_INTRO_2: + events.ScheduleEvent(EVENT_INTRO_MOVE_3, 1, 0, PHASE_INTRO); + break; + case POINT_LK_INTRO_3: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->DoAction(ACTION_CONTINUE_INTRO); + events.ScheduleEvent(EVENT_INTRO_TALK_1, 9000, 0, PHASE_INTRO); + break; + case POINT_CENTER_1: + me->SetFacing(0.0f); + Talk(SAY_LK_REMORSELESS_WINTER); + SendMusicToPlayers(MUSIC_SPECIAL); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + DoCast(me, SPELL_REMORSELESS_WINTER_1); + events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions + events.ScheduleEvent(EVENT_QUAKE, 62500, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 4000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 3000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_VALKYR, 78000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_INFEST, 70000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_DEFILE, 97000, 0, PHASE_TWO); + events.ScheduleEvent(EVENT_SOUL_REAPER, 94000, 0, PHASE_TWO); + break; + case POINT_CENTER_2: + me->SetFacing(0.0f); + Talk(SAY_LK_REMORSELESS_WINTER); + SendMusicToPlayers(MUSIC_SPECIAL); + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + DoCast(me, SPELL_REMORSELESS_WINTER_2); + summons.DespawnEntry(NPC_VALKYR_SHADOWGUARD); + events.DelayEvents(62500, EVENT_GROUP_BERSERK); // delay berserk timer, its not ticking during phase transitions + events.ScheduleEvent(EVENT_QUAKE_2, 62500, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 6000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 5000, 0, PHASE_TRANSITION); + events.ScheduleEvent(EVENT_DEFILE, 95500, 0, PHASE_THREE); + events.ScheduleEvent(EVENT_SOUL_REAPER, 99500, 0, PHASE_THREE); + events.ScheduleEvent(EVENT_VILE_SPIRITS, 79500, EVENT_GROUP_VILE_SPIRITS, PHASE_THREE); + events.ScheduleEvent(IsHeroic() ? EVENT_HARVEST_SOULS : EVENT_HARVEST_SOUL, 73500, 0, PHASE_THREE); + break; + case POINT_LK_OUTRO_1: + events.ScheduleEvent(EVENT_OUTRO_TALK_4, 1, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_RAISE_DEAD, 1000, 0, PHASE_OUTRO); + events.ScheduleEvent(EVENT_OUTRO_TALK_5, 29000, 0, PHASE_OUTRO); + break; + case POINT_LK_OUTRO_2: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->Talk(SAY_TIRION_OUTRO_2); + if (Creature* frostmourne = me->FindNearestCreature(NPC_FROSTMOURNE_TRIGGER, 50.0f)) + frostmourne->AI()->DoAction(ACTION_SUMMON_TERENAS); + break; + default: + break; + } + } + + void UpdateAI(uint32 const diff) + { + // check phase first to prevent updating victim and entering evade mode when not wanted + if (!(events.GetPhaseMask() & PHASE_MASK_NO_VICTIM)) + if (!UpdateVictim()) + return; + + events.Update(diff); + + // during Remorseless Winter phases The Lich King is channeling a spell, but we must continue casting other spells + if (me->HasUnitState(UNIT_STAT_CASTING) && !(events.GetPhaseMask() & PHASE_MASK_NO_CAST_CHECK)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_INTRO_MOVE_1: + me->SetSheath(SHEATH_STATE_MELEE); + me->RemoveAurasDueToSpell(SPELL_EMOTE_SIT_NO_SHEATH); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_1, LichKingIntro[0]); + break; + case EVENT_INTRO_MOVE_2: + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_2, LichKingIntro[1]); + break; + case EVENT_INTRO_MOVE_3: + me->GetMotionMaster()->MovePoint(POINT_LK_INTRO_3, LichKingIntro[2]); + break; + case EVENT_INTRO_TALK_1: + Talk(SAY_LK_INTRO_2); + // for some reason blizz sends 2 emotes in row here so (we handle one in Talk) + me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 13000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18000, 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_INTRO_CAST_FREEZE, 31000, 0, PHASE_INTRO); + break; + case EVENT_EMOTE_CAST_SHOUT: + DoCast(me, SPELL_EMOTE_SHOUT_NO_SHEATH, false); + break; + case EVENT_INTRO_EMOTE_1: + me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); + break; + case EVENT_INTRO_CAST_FREEZE: + Talk(SAY_LK_INTRO_3); + DoCastAOE(SPELL_ICE_LOCK, false); + events.ScheduleEvent(EVENT_FINISH_INTRO, 1000, 0, PHASE_INTRO); + break; + case EVENT_FINISH_INTRO: + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetReactState(REACT_AGGRESSIVE); + events.SetPhase(PHASE_ONE); + break; + case EVENT_SUMMON_SHAMBLING_HORROR: + DoCast(me, SPELL_SUMMON_SHAMBLING_HORROR); + SendMusicToPlayers(MUSIC_SPECIAL); + events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 60000, 0, PHASE_ONE); + break; + case EVENT_SUMMON_DRUDGE_GHOUL: + DoCast(me, SPELL_SUMMON_DRUDGE_GHOULS); + events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 30000, 0, PHASE_ONE); + break; + case EVENT_INFEST: + DoCast(me, SPELL_INFEST); + events.ScheduleEvent(EVENT_INFEST, urand(21000, 24000), 0, (events.GetPhaseMask() & PHASE_MASK_ONE) ? PHASE_ONE : PHASE_TWO); + break; + case EVENT_NECROTIC_PLAGUE: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) + { + Talk(EMOTE_NECROTIC_PLAGUE_WARNING, target->GetGUID()); + DoCast(target, SPELL_NECROTIC_PLAGUE); + } + events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE); + break; + case EVENT_SHADOW_TRAP: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + DoCast(target, SPELL_SHADOW_TRAP); + events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); + break; + case EVENT_SOUL_REAPER: + DoCastVictim(SPELL_SOUL_REAPER); + events.ScheduleEvent(EVENT_SOUL_REAPER, urand(33000, 35000), 0, PHASE_TWO_THREE); + break; + case EVENT_DEFILE: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_HARVEST_SOUL_VALKYR)) + { + Talk(EMOTE_DEFILE_WARNING); + DoCast(target, SPELL_DEFILE); + } + events.ScheduleEvent(EVENT_DEFILE, urand(32000, 35000), 0, PHASE_TWO_THREE); + break; + case EVENT_HARVEST_SOUL: + Talk(SAY_LK_HARVEST_SOUL); + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SpellTargetSelector(me, SPELL_HARVEST_SOUL))) + DoCast(target, SPELL_HARVEST_SOUL); + events.ScheduleEvent(EVENT_HARVEST_SOUL, 75000, 0, PHASE_THREE); + break; + case EVENT_PAIN_AND_SUFFERING: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + me->CastSpell(target, SPELL_PAIN_AND_SUFFERING, TRIGGERED_NONE); + events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, urand(1500, 4000), 0, PHASE_TRANSITION); + break; + case EVENT_SUMMON_ICE_SPHERE: + DoCastAOE(SPELL_SUMMON_ICE_SPHERE); + events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, urand(7500, 8500), 0, PHASE_TRANSITION); + break; + case EVENT_SUMMON_RAGING_SPIRIT: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + me->CastSpell(target, SPELL_RAGING_SPIRIT, TRIGGERED_NONE); + events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, urand(22000, 23000), 0, PHASE_TRANSITION); + break; + case EVENT_QUAKE: + events.SetPhase(PHASE_TWO); + me->ClearUnitState(UNIT_STAT_CASTING); // clear state to ensure check in DoCastAOE passes + DoCastAOE(SPELL_QUAKE); + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_QUAKE); + break; + case EVENT_QUAKE_2: + events.SetPhase(PHASE_THREE); + me->ClearUnitState(UNIT_STAT_CASTING); // clear state to ensure check in DoCastAOE passes + DoCastAOE(SPELL_QUAKE); + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_QUAKE); + break; + case EVENT_SUMMON_VALKYR: + SendMusicToPlayers(MUSIC_SPECIAL); + Talk(SAY_LK_SUMMON_VALKYR); + DoCastAOE(SUMMON_VALKYR); + events.ScheduleEvent(EVENT_SUMMON_VALKYR, urand(45000, 50000), 0, PHASE_TWO); + break; + case EVENT_START_ATTACK: + me->SetReactState(REACT_AGGRESSIVE); + if (events.GetPhaseMask() & PHASE_MASK_FROSTMOURNE) + events.SetPhase(PHASE_THREE); + break; + case EVENT_VILE_SPIRITS: + SendMusicToPlayers(MUSIC_SPECIAL); + DoCastAOE(SPELL_VILE_SPIRITS); + events.ScheduleEvent(EVENT_VILE_SPIRITS, urand(35000, 40000), EVENT_GROUP_VILE_SPIRITS, PHASE_THREE); + break; + case EVENT_WICKED_SPIRITS: + DoCastAOE(SPELL_VILE_SPIRITS); + events.ScheduleEvent(EVENT_WICKED_SPIRITS, urand(35000, 40000), 0, PHASE_FROSTMOURNE); + break; + case EVENT_HARVEST_SOULS: + Talk(SAY_LK_HARVEST_SOUL); + DoCastAOE(SPELL_HARVEST_SOULS); + events.ScheduleEvent(EVENT_HARVEST_SOULS, urand(100000, 110000), 0, PHASE_THREE); + events.SetPhase(PHASE_FROSTMOURNE); // will stop running UpdateVictim (no evading) + me->SetReactState(REACT_PASSIVE); + me->AttackStop(); + events.ScheduleEvent(EVENT_WICKED_SPIRITS, events.GetNextEventTime(EVENT_VILE_SPIRITS) - events.GetTimer(), 0, PHASE_FROSTMOURNE); + events.DelayEvents(50000, EVENT_GROUP_VILE_SPIRITS); + events.RescheduleEvent(EVENT_DEFILE, 50000, 0, PHASE_THREE); + events.RescheduleEvent(EVENT_SOUL_REAPER, urand(57000, 62000), 0, PHASE_THREE); + events.ScheduleEvent(EVENT_START_ATTACK, 49000); + events.ScheduleEvent(EVENT_FROSTMOURNE_HEROIC, 6500); + break; + case EVENT_FROSTMOURNE_HEROIC: + if (TempSummon* terenas = me->GetMap()->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE_H, TerenasSpawnHeroic, NULL, 50000)) + { + terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f); + if (!triggers.empty()) + { + triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, true)); + Unit* spawner = triggers.front(); + spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_1, true); // summons bombs randomly + spawner->CastSpell(spawner, SPELL_SUMMON_SPIRIT_BOMB_2, true); // summons bombs on players + } + + for (SummonList::iterator i = summons.begin(); i != summons.end(); ++i) + { + Creature* summon = ObjectAccessor::GetCreature(*me, *i); + if (summon && summon->GetEntry() == NPC_VILE_SPIRIT) + TeleportSpirit(summon); + } + } + break; + case EVENT_OUTRO_TALK_1: + Talk(SAY_LK_OUTRO_1); + DoCastAOE(SPELL_FURY_OF_FROSTMOURNE_NO_REZ, true); + break; + case EVENT_OUTRO_TALK_2: + Talk(SAY_LK_OUTRO_2); + DoCastAOE(SPELL_EMOTE_QUESTION_NO_SHEATH); + break; + case EVENT_OUTRO_EMOTE_TALK: + me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); + break; + case EVENT_OUTRO_TALK_3: + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + me->SetFacing(0.0f, tirion); + Talk(SAY_LK_OUTRO_3); + break; + case EVENT_OUTRO_MOVE_CENTER: + me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_1, CenterPosition); + break; + case EVENT_OUTRO_TALK_4: + me->SetFacing(0.01745329f); + Talk(SAY_LK_OUTRO_4); + break; + case EVENT_OUTRO_RAISE_DEAD: + DoCastAOE(SPELL_RAISE_DEAD); + me->ClearUnitState(UNIT_STAT_CASTING); + SendMusicToPlayers(MUSIC_FINAL); + break; + case EVENT_OUTRO_TALK_5: + Talk(SAY_LK_OUTRO_5); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->DoAction(ACTION_OUTRO); + break; + case EVENT_OUTRO_TALK_6: + Talk(SAY_LK_OUTRO_6); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->SetFacing(0.0f, me); + me->ClearUnitState(UNIT_STAT_CASTING); + DoCastAOE(SPELL_SUMMON_BROKEN_FROSTMOURNE_3); + SetEquipmentSlots(false, EQUIP_UNEQUIP); + break; + case EVENT_OUTRO_SOUL_BARRAGE: + DoCastAOE(SPELL_SOUL_BARRAGE); + sCreatureTextMgr->SendSound(me, SOUND_PAIN, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false); + // set flight + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x03); + me->GetMotionMaster()->MovePoint(POINT_LK_OUTRO_2, OutroFlying); + break; + case EVENT_OUTRO_TALK_7: + Talk(SAY_LK_OUTRO_7); + break; + case EVENT_OUTRO_TALK_8: + Talk(SAY_LK_OUTRO_8); + break; + case EVENT_BERSERK: + Talk(SAY_LK_BERSERK); + DoCast(me, SPELL_BERSERK2); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + + void TeleportSpirit(Creature* summon) + { + float dist = me->GetObjectSize() + (15.0f - me->GetObjectSize()) * float(rand_norm()); + float angle = float(rand_norm()) * float(2.0f * M_PI); + Position dest = TerenasSpawnHeroic; + me->MovePosition(dest, dist, angle); + dest.m_positionZ += 15.0f; + summon->UpdateEntry(NPC_WICKED_SPIRIT); + summon->SetReactState(REACT_PASSIVE); + summon->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); + summon->SetSpeed(MOVE_FLIGHT, 0.5f); + summon->m_Events.KillAllEvents(true); + summon->m_Events.AddEvent(new VileSpiritActivateEvent(summon), summon->m_Events.CalculateTime(1000)); + } + + void SendMusicToPlayers(uint32 musicId) const + { + WorldPacket data(SMSG_PLAY_MUSIC, 4); + data << uint32(musicId); + SendPacketToPlayers(&data); + } + + void SendLightOverride(uint32 overrideId, uint32 fadeInTime) const + { + WorldPacket data(SMSG_OVERRIDE_LIGHT, 12); + data << uint32(2488); // Light.dbc entry (map default) + data << uint32(overrideId); // Light.dbc entry (override) + data << uint32(fadeInTime); + SendPacketToPlayers(&data); + } + + void SendWeather(WeatherState weather) const + { + WorldPacket data(SMSG_WEATHER, 9); + data << uint32(weather); + data << float(0.5f); + data << uint8(0); + SendPacketToPlayers(&data); + } + + // Send packet to all players in The Frozen Throne + void SendPacketToPlayers(WorldPacket const* data) const + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (!players.isEmpty()) + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + if (Player* player = itr->getSource()) + if (player->GetAreaId() == AREA_THE_FROZEN_THRONE) + player->GetSession()->SendPacket(data); + } + + uint32 _necroticPlagueStack; + uint32 _vileSpiritExplosions; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<boss_the_lich_kingAI>(creature); + } +}; + +class npc_tirion_fordring_tft : public CreatureScript +{ + public: + npc_tirion_fordring_tft() : CreatureScript("npc_tirion_fordring_tft") { } + + struct npc_tirion_fordringAI : public ScriptedAI + { + npc_tirion_fordringAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (id) + { + case POINT_TIRION_INTRO: + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); + if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + theLichKing->AI()->DoAction(ACTION_START_ENCOUNTER); + break; + case POINT_TIRION_OUTRO_1: + _events.ScheduleEvent(EVENT_OUTRO_JUMP, 1, 0, PHASE_OUTRO); + break; + } + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_CONTINUE_INTRO: + Talk(SAY_TIRION_INTRO_1); + _events.ScheduleEvent(EVENT_INTRO_TALK_1, 34000, 0, PHASE_INTRO); + break; + case ACTION_OUTRO: + _events.SetPhase(PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_TALK_1, 7000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_BLESS, 18000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_REMOVE_ICE, 23000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_MOVE_1, 25000, 0, PHASE_OUTRO); + break; + } + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_ICE_LOCK) + me->SetFacing(3.085098f); + else if (spell->Id == SPELL_BROKEN_FROSTMOURNE_KNOCK) + SetEquipmentSlots(true); // remove glow on ashbringer + } + + void sGossipSelect(Player* player, uint32 sender, uint32 action) + { + if (me->GetCreatureInfo()->GossipMenuId == sender && !action) + { + _events.SetPhase(PHASE_INTRO); + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_TIRION_INTRO, TirionIntro); + } + } + + void JustReachedHome() + { + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) + return; + + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim() && !(_events.GetPhaseMask() & (PHASE_MASK_INTRO | PHASE_MASK_OUTRO))) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_INTRO_TALK_1: + Talk(SAY_TIRION_INTRO_2); + _events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 2000, 0, PHASE_INTRO); + _events.ScheduleEvent(EVENT_INTRO_CHARGE, 5000, 0, PHASE_INTRO); + break; + case EVENT_INTRO_EMOTE_1: + me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); + break; + case EVENT_INTRO_CHARGE: + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + me->GetMotionMaster()->MovePoint(POINT_TIRION_CHARGE, TirionCharge); + break; + case EVENT_OUTRO_TALK_1: + Talk(SAY_TIRION_OUTRO_1); + break; + case EVENT_OUTRO_BLESS: + DoCast(me, SPELL_LIGHTS_BLESSING); + break; + case EVENT_OUTRO_REMOVE_ICE: + me->RemoveAurasDueToSpell(SPELL_ICE_LOCK); + SetEquipmentSlots(false, EQUIP_ASHBRINGER_GLOWING); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + me->SetFacing(0.0f, lichKing); + lichKing->AI()->DoAction(ACTION_PLAY_MUSIC); + } + break; + case EVENT_OUTRO_MOVE_1: + me->GetMotionMaster()->MovePoint(POINT_TIRION_OUTRO_1, OutroPosition1); + break; + case EVENT_OUTRO_JUMP: + DoCastAOE(SPELL_JUMP); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_tirion_fordringAI>(creature); + } +}; + +class npc_shambling_horror_icc : public CreatureScript +{ + public: + npc_shambling_horror_icc() : CreatureScript("npc_shambling_horror_icc") { } + + struct npc_shambling_horror_iccAI : public ScriptedAI + { + npc_shambling_horror_iccAI(Creature* creature) : ScriptedAI(creature) + { + _frenzied = false; + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); + _events.ScheduleEvent(EVENT_ENRAGE, urand(11000, 14000)); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (IsHeroic() && me->HealthBelowPctDamaged(20, damage)) + { + _frenzied = true; + DoCast(me, SPELL_FRENZY, true); + } + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SHOCKWAVE: + DoCast(me, SPELL_SHOCKWAVE); + _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); + break; + case EVENT_ENRAGE: + DoCast(me, SPELL_ENRAGE); + _events.ScheduleEvent(EVENT_ENRAGE, urand(20000, 25000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + bool _frenzied; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_shambling_horror_iccAI>(creature); + } +}; + +class npc_raging_spirit : public CreatureScript +{ + public: + npc_raging_spirit() : CreatureScript("npc_raging_spirit") { } + + struct npc_raging_spiritAI : public ScriptedAI + { + npc_raging_spiritAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); + DoCast(me, SPELL_PLAGUE_AVOIDANCE, true); + DoCast(me, SPELL_RAGING_SPIRIT_VISUAL, true); + if (TempSummon* summon = me->ToTempSummon()) + if (Unit* summoner = summon->GetSummoner()) + summoner->CastSpell(me, SPELL_RAGING_SPIRIT_VISUAL_CLONE, true); + DoCast(me, SPELL_BOSS_HITTIN_YA, true); + } + + void IsSummonedBy(Unit* summoner) + { + // player is the spellcaster so register summon manually + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->JustSummoned(me); + } + + void JustDied(Unit* killer) + { + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + if (TempSummon* summon = me->ToTempSummon()) + summon->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SOUL_SHRIEK: + DoCastAOE(SPELL_SOUL_SHRIEK); + _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_raging_spiritAI>(creature); + } +}; + +class npc_valkyr_shadowguard : public CreatureScript +{ + public: + npc_valkyr_shadowguard() : CreatureScript("npc_valkyr_shadowguard") { } + + struct npc_valkyr_shadowguardAI : public ScriptedAI + { + npc_valkyr_shadowguardAI(Creature* creature) : ScriptedAI(creature), + _grabbedPlayer(0), _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + me->SetReactState(REACT_PASSIVE); + me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); + } + + void IsSummonedBy(Unit* /*summoner*/) + { + _events.Reset(); + _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (!IsHeroic()) + return; + + if (!me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) + return; + + if (me->HealthBelowPctDamaged(50, damage)) + { + _events.Reset(); + DoCastAOE(SPELL_EJECT_ALL_PASSENGERS); + me->GetMotionMaster()->MoveTargetedHome(); + me->ClearUnitState(UNIT_STAT_EVADE); + } + } + + void JustReachedHome() + { + // schedule siphon life event (heroic only) + DoZoneInCombat(); + _events.Reset(); + _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2000); + } + + void AttackStart(Unit* /*target*/) + { + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + + switch (id) + { + case POINT_DROP_PLAYER: + DoCastAOE(SPELL_EJECT_ALL_PASSENGERS); + me->DespawnOrUnsummon(1000); + break; + case POINT_CHARGE: + if (Player* target = ObjectAccessor::GetPlayer(*me, _grabbedPlayer)) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + if (GameObject* platform = ObjectAccessor::GetGameObject(*me, _instance->GetData64(DATA_ARTHAS_PLATFORM))) + { + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, me, NPC_WORLD_TRIGGER, 150.0f); + triggers.remove_if(HeightDifferenceCheck(platform, 5.0f, true)); + if (triggers.empty()) + return; + + triggers.sort(Trinity::ObjectDistanceOrderPred(me)); + DoCast(target, SPELL_VALKYR_CARRY); + _dropPoint.Relocate(triggers.front()); + _events.ScheduleEvent(EVENT_MOVE_TO_DROP_POS, 1500); + + } + } + else + me->DespawnOrUnsummon(); + break; + default: + break; + } + } + + void SetGUID(uint64 guid, int32 /* = 0*/) + { + _grabbedPlayer = guid; + _events.Reset(); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + if (me->HasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_GRAB_PLAYER: + DoCastAOE(SPELL_VALKYR_TARGET_SEARCH); + _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000); + break; + case EVENT_MOVE_TO_DROP_POS: + me->GetMotionMaster()->MovePoint(POINT_DROP_PLAYER, _dropPoint); + break; + case EVENT_LIFE_SIPHON: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + DoCast(target, SPELL_LIFE_SIPHON); + _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500); + break; + default: + break; + } + } + + // no melee attacks + } + + private: + EventMap _events; + Position _dropPoint; + uint64 _grabbedPlayer; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_valkyr_shadowguardAI>(creature); + } +}; + +class npc_strangulate_vehicle : public CreatureScript +{ + public: + npc_strangulate_vehicle() : CreatureScript("npc_strangulate_vehicle") { } + + struct npc_strangulate_vehicleAI : public ScriptedAI + { + npc_strangulate_vehicleAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void IsSummonedBy(Unit* summoner) + { + me->SetFacing(0.0f, summoner); + DoCast(summoner, SPELL_HARVEST_SOUL_VEHICLE); + _events.Reset(); + _events.ScheduleEvent(EVENT_MOVE_TO_LICH_KING, 2000); + _events.ScheduleEvent(EVENT_TELEPORT, 6000); + + // this will let us easily access all creatures of this entry on heroic mode when its time to teleport back + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->JustSummoned(me); + } + + void DoAction(int32 const action) + { + if (action != ACTION_TELEPORT_BACK) + return; + + if (TempSummon* summ = me->ToTempSummon()) + if (Unit* summoner = summ->GetSummoner()) + DoCast(summoner, SPELL_HARVEST_SOUL_TELEPORT_BACK); + + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_TELEPORT: + me->GetMotionMaster()->MoveIdle(MOTION_SLOT_ACTIVE); + if (TempSummon* summ = me->ToTempSummon()) + { + if (Unit* summoner = summ->GetSummoner()) + { + summoner->CastSpell((Unit*)NULL, SPELL_HARVEST_SOUL_VISUAL, true); + summoner->ExitVehicle(summoner); + if (!IsHeroic()) + summoner->CastSpell(summoner, SPELL_HARVEST_SOUL_TELEPORT, true); + else + { + summoner->CastSpell(summoner, SPELL_HARVEST_SOULS_TELEPORT, true); + summoner->RemoveAurasDueToSpell(HARVEST_SOUL, 0, 0, AURA_REMOVE_BY_EXPIRE); + } + } + } + + _events.ScheduleEvent(EVENT_DESPAWN_SELF, 65000); + break; + case EVENT_MOVE_TO_LICH_KING: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + if (me->GetExactDist(lichKing) > 10.0f) + { + Position pos; + lichKing->GetNearPosition(pos, float(rand_norm()) * 5.0f + 7.5f, lichKing->GetAngle(me)); + me->GetMotionMaster()->MovePoint(0, pos); + } + } + break; + case EVENT_DESPAWN_SELF: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->SummonedCreatureDespawn(me); + me->DespawnOrUnsummon(1); + break; + default: + break; + } + } + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_strangulate_vehicleAI>(creature); + } +}; + +class npc_terenas_menethil : public CreatureScript +{ + public: + npc_terenas_menethil() : CreatureScript("npc_terenas_menethil") { } + + struct npc_terenas_menethilAI : public ScriptedAI + { + npc_terenas_menethilAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + bool CanAIAttack(Unit const* target) const + { + return target->GetEntry() != NPC_THE_LICH_KING; + } + + void DoAction(int32 const action) + { + switch (action) + { + case ACTION_FROSTMOURNE_INTRO: + me->setActive(true); + if (!IsHeroic()) + me->SetHealth(me->GetMaxHealth() / 2); + DoCast(me, SPELL_LIGHTS_FAVOR); + _events.Reset(); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_1, 2000, PHASE_FROSTMOURNE); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_2, 11000, PHASE_FROSTMOURNE); + if (!IsHeroic()) + { + _events.ScheduleEvent(EVENT_DESTROY_SOUL, 60000, PHASE_FROSTMOURNE); + _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_3, 25000); + } + break; + case ACTION_TELEPORT_BACK: + me->CastSpell((Unit*)NULL, SPELL_RESTORE_SOUL, TRIGGERED_NONE); + me->DespawnOrUnsummon(3000); + break; + default: + break; + } + } + + void EnterEvadeMode() + { + // no running back home + if (!me->isAlive()) + return; + + me->DeleteThreatList(); + me->CombatStop(false); + } + + void DamageTaken(Unit* /*attacker*/, uint32& damage) + { + if (damage >= me->GetHealth()) + { + damage = me->GetHealth() - 1; + if (!me->HasAura(SPELL_TERENAS_LOSES_INSIDE) && !IsHeroic()) + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + DoCast(SPELL_TERENAS_LOSES_INSIDE); + _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000); + if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) + { + warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, TRIGGERED_NONE); + warden->DespawnOrUnsummon(2000); + } + + me->DespawnOrUnsummon(2000); + } + } + } + + void IsSummonedBy(Unit* /*summoner*/) + { + _events.Reset(); + _events.SetPhase(PHASE_OUTRO); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + me->SetFacing(0.0f, lichKing); + + _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_1, 2000, 0, PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_2, 14000, 0, PHASE_OUTRO); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_FROSTMOURNE_TALK_1: + Talk(SAY_TERENAS_INTRO_1); + if (IsHeroic()) + DoCastAOE(SPELL_RESTORE_SOULS); + break; + case EVENT_FROSTMOURNE_TALK_2: + Talk(SAY_TERENAS_INTRO_2); + break; + case EVENT_FROSTMOURNE_TALK_3: + Talk(SAY_TERENAS_INTRO_3); + break; + case EVENT_OUTRO_TERENAS_TALK_1: + Talk(SAY_TERENAS_OUTRO_1); + break; + case EVENT_OUTRO_TERENAS_TALK_2: + Talk(SAY_TERENAS_OUTRO_2); + DoCastAOE(SPELL_MASS_RESURRECTION); + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + { + lichKing->AI()->DoAction(ACTION_FINISH_OUTRO); + lichKing->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE); + if (Creature* tirion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) + tirion->AI()->AttackStart(lichKing); + } + break; + case EVENT_DESTROY_SOUL: + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f)) + warden->CastSpell((Unit*)NULL, SPELL_DESTROY_SOUL, TRIGGERED_NONE); + DoCast(SPELL_TERENAS_LOSES_INSIDE); + _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000); + break; + case EVENT_TELEPORT_BACK: + if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->DoAction(ACTION_TELEPORT_BACK); + break; + default: + break; + } + } + + // fighting Spirit Warden + if (me->isInCombat()) + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_terenas_menethilAI>(creature); + } +}; + +class npc_spirit_warden : public CreatureScript +{ + public: + npc_spirit_warden() : CreatureScript("npc_spirit_warden") { } + + struct npc_spirit_wardenAI : public ScriptedAI + { + npc_spirit_wardenAI(Creature* creature) : ScriptedAI(creature), + _instance(creature->GetInstanceScript()) + { + } + + void Reset() + { + _events.Reset(); + _events.ScheduleEvent(EVENT_SOUL_RIP, urand(12000, 15000)); + DoCast(SPELL_DARK_HUNGER); + } + + void JustDied(Unit* /*killer*/) + { + if (Creature* terenas = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TERENAS_MENETHIL))) + terenas->AI()->DoAction(ACTION_TELEPORT_BACK); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_SOUL_RIP: + DoCastVictim(SPELL_SOUL_RIP); + _events.ScheduleEvent(EVENT_SOUL_RIP, urand(23000, 27000)); + break; + default: + break; + } + } + + DoMeleeAttackIfReady(); + } + + private: + EventMap _events; + InstanceScript* _instance; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_spirit_wardenAI>(creature); + } +}; + +class npc_spirit_bomb : public CreatureScript +{ + public: + npc_spirit_bomb() : CreatureScript("npc_spirit_bomb") { } + + struct npc_spirit_bombAI : public CreatureAI + { + npc_spirit_bombAI(Creature* creature) : CreatureAI(creature) + { + } + + void IsSummonedBy(Unit* summoner) + { + float destX, destY, destZ; + me->GetPosition(destX, destY); + destZ = 1055.0f; // approximation, gets more precise later + me->UpdateGroundPositionZ(destX, destY, destZ); + me->GetMotionMaster()->MovePoint(POINT_GROUND, destX, destY, destZ); + } + + void MovementInform(uint32 type, uint32 point) + { + if (type != POINT_MOTION_TYPE || point != POINT_GROUND) + return; + + me->RemoveAllAuras(); + DoCastAOE(SPELL_EXPLOSION); + me->DespawnOrUnsummon(1000); + } + + void AttackStart(Unit* /*victim*/) + { + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + // no melee attacks + } + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_spirit_bombAI>(creature); + } +}; + +class npc_broken_frostmourne : public CreatureScript +{ + public: + npc_broken_frostmourne() : CreatureScript("npc_broken_frostmourne") { } + + struct npc_broken_frostmourneAI : public CreatureAI + { + npc_broken_frostmourneAI(Creature* creature) : CreatureAI(creature) + { + } + + void Reset() + { + _events.Reset(); + } + + void IsSummonedBy(Unit* summoner) + { + _events.SetPhase(PHASE_OUTRO); + _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO); + } + + void DoAction(int32 const action) + { + if (action == ACTION_SUMMON_TERENAS) + _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); + } + + void UpdateAI(uint32 const diff) + { + UpdateVictim(); + + _events.Update(diff); + + while (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_OUTRO_KNOCK_BACK: + DoCastAOE(SPELL_BROKEN_FROSTMOURNE_KNOCK); + break; + case EVENT_OUTRO_SUMMON_TERENAS: + DoCastAOE(SPELL_SUMMON_TERENAS); + break; + default: + break; + } + } + + // no melee attacks + } + + private: + EventMap _events; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return GetIcecrownCitadelAI<npc_broken_frostmourneAI>(creature); + } +}; + +class spell_the_lich_king_infest : public SpellScriptLoader +{ + public: + spell_the_lich_king_infest() : SpellScriptLoader("spell_the_lich_king_infest") { } + + class spell_the_lich_king_infest_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_infest_AuraScript); + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (GetUnitOwner()->HealthAbovePct(90)) + { + PreventDefaultAction(); + Remove(AURA_REMOVE_BY_ENEMY_SPELL); + } + } + + void OnUpdate(AuraEffect* aurEff) + { + // multiply, starting from 2nd tick + if (aurEff->GetTickNumber() == 1) + return; + + aurEff->SetAmount(int32(aurEff->GetAmount() * 1.15f)); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_infest_AuraScript(); + } +}; + +class spell_the_lich_king_necrotic_plague : public SpellScriptLoader +{ + public: + spell_the_lich_king_necrotic_plague() : SpellScriptLoader("spell_the_lich_king_necrotic_plague") { } + + class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_NECROTIC_PLAGUE_JUMP)) + return false; + return true; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + Unit* newCaster = GetTarget(); + switch (GetTargetApplication()->GetRemoveMode()) + { + case AURA_REMOVE_BY_ENEMY_SPELL: + case AURA_REMOVE_BY_EXPIRE: + case AURA_REMOVE_BY_DEATH: + break; + default: + return; + } + + CustomSpellValues values; + //values.AddSpellMod(SPELLVALUE_AURA_STACK, 2); + values.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_necrotic_plague_AuraScript(); + } +}; + +class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader +{ + public: + spell_the_lich_king_necrotic_plague_jump() : SpellScriptLoader("spell_the_lich_king_necrotic_plague_jump") { } + + class spell_the_lich_king_necrotic_plague_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript); + + bool Load() + { + _hadAura = false; + return true; + } + + void SelectTarget(std::list<Unit*>& targets) + { + targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); + if (targets.size() < 2) + return; + + targets.resize(1); + } + + void CheckAura() + { + if (GetHitUnit()->HasAura(GetSpellInfo()->Id)) + _hadAura = true; + } + + void AddMissingStack() + { + if (!_hadAura && GetSpellValue()->EffectBasePoints[EFFECT_1] != AURA_REMOVE_BY_ENEMY_SPELL) + GetHitAura()->ModStackAmount(1); + } + + void Register() + { + BeforeHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); + OnHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); + } + + bool _hadAura; + }; + + class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); + + bool Load() + { + _lastAmount = 0; + return true; + } + + void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* caster = GetCaster()) + caster->GetAI()->SetData(DATA_PLAGUE_STACK, GetStackAmount()); + } + + void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + _lastAmount = aurEff->GetAmount(); + switch (GetTargetApplication()->GetRemoveMode()) + { + case AURA_REMOVE_BY_EXPIRE: + case AURA_REMOVE_BY_DEATH: + break; + default: + return; + } + + CustomSpellValues values; + values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + } + + void OnDispel(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + _lastAmount = aurEff->GetAmount(); + } + + void AfterDispel(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + { + // this means the stack increased so don't process as if dispelled + if (aurEff->GetAmount() > _lastAmount) + return; + + CustomSpellValues values; + values.AddSpellMod(SPELLVALUE_AURA_STACK, GetStackAmount()); + values.AddSpellMod(SPELLVALUE_BASE_POINT1, AURA_REMOVE_BY_ENEMY_SPELL); // add as marker (spell has no effect 1) + GetTarget()->CastCustomSpell(SPELL_NECROTIC_PLAGUE_JUMP, values, NULL, true, NULL, NULL, GetCasterGUID()); + if (Unit* caster = GetCaster()) + caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); + + Remove(AURA_REMOVE_BY_ENEMY_SPELL); + } + + void Register() + { + OnEffectApply += AuraEffectApplyFn(spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::AfterDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + } + + int32 _lastAmount; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_necrotic_plague_SpellScript(); + } + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_necrotic_plague_AuraScript(); + } +}; + +class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader +{ + public: + spell_the_lich_king_shadow_trap_visual() : SpellScriptLoader("spell_the_lich_king_shadow_trap_visual") { } + + class spell_the_lich_king_shadow_trap_visual_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_shadow_trap_visual_AuraScript); + + void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes mode) + { + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) + GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_TRAP_AURA, TRIGGERED_NONE); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_shadow_trap_visual_AuraScript(); + } +}; + +class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader +{ + public: + spell_the_lich_king_shadow_trap_periodic() : SpellScriptLoader("spell_the_lich_king_shadow_trap_periodic") { } + + class spell_the_lich_king_shadow_trap_periodic_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic_SpellScript); + + void CheckTargetCount(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_shadow_trap_periodic_SpellScript(); + } +}; + +class spell_the_lich_king_quake : public SpellScriptLoader +{ + public: + spell_the_lich_king_quake() : SpellScriptLoader("spell_the_lich_king_quake") { } + + class spell_the_lich_king_quake_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_quake_SpellScript); + + bool Load() + { + return GetCaster()->GetInstanceScript() != NULL; + } + + void FilterTargets(std::list<Unit*>& unitList) + { + if (GameObject* platform = ObjectAccessor::GetGameObject(*GetCaster(), GetCaster()->GetInstanceScript()->GetData64(DATA_ARTHAS_PLATFORM))) + unitList.remove_if(HeightDifferenceCheck(platform, 5.0f, false)); + } + + void HandleSendEvent(SpellEffIndex /*effIndex*/) + { + if (GetCaster()->IsAIEnabled) + GetCaster()->GetAI()->DoAction(ACTION_START_ATTACK); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHit += SpellEffectFn(spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_quake_SpellScript(); + } +}; + +class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_ice_burst_target_search() : SpellScriptLoader("spell_the_lich_king_ice_burst_target_search") { } + + class spell_the_lich_king_ice_burst_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) + return false; + return true; + } + + void CheckTargetCount(std::list<Unit*>& unitList) + { + if (unitList.empty()) + return; + + // if there is at least one affected target cast the explosion + GetCaster()->CastSpell(GetCaster(), SPELL_ICE_BURST, true); + if (GetCaster()->GetTypeId() == TYPEID_UNIT) + GetCaster()->ToCreature()->DespawnOrUnsummon(500); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_ice_burst_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_raging_spirit : public SpellScriptLoader +{ + public: + spell_the_lich_king_raging_spirit() : SpellScriptLoader("spell_the_lich_king_raging_spirit") { } + + class spell_the_lich_king_raging_spirit_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) + return false; + return true; + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_raging_spirit_SpellScript(); + } +}; + +class ExactDistanceCheck +{ + public: + ExactDistanceCheck(Unit* source, float dist) : _source(source), _dist(dist) {} + + bool operator()(Unit* unit) + { + return _source->GetExactDist2d(unit) > _dist; + } + + private: + Unit* _source; + float _dist; +}; + +class spell_the_lich_king_defile : public SpellScriptLoader +{ + public: + spell_the_lich_king_defile() : SpellScriptLoader("spell_the_lich_king_defile") { } + + class spell_the_lich_king_defile_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_defile_SpellScript); + + void CorrectRange(std::list<Unit*>& targets) + { + targets.remove_if(ExactDistanceCheck(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X))); + } + + void ChangeDamageAndGrow() + { + SetHitDamage(int32(GetHitDamage() * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X))); + // HACK: target player should cast this spell on defile + // however with current aura handling auras cast by different units + // cannot stack on the same aura object increasing the stack count + GetCaster()->CastSpell(GetCaster(), SPELL_DEFILE_GROW, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit += SpellHitFn(spell_the_lich_king_defile_SpellScript::ChangeDamageAndGrow); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_defile_SpellScript(); + } +}; + +class spell_the_lich_king_summon_into_air : public SpellScriptLoader +{ + public: + spell_the_lich_king_summon_into_air() : SpellScriptLoader("spell_the_lich_king_summon_into_air") { } + + class spell_the_lich_king_summon_into_air_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_summon_into_air_SpellScript); + + void ModDestHeight(SpellEffIndex effIndex) + { + static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f}; + WorldLocation* dest = const_cast<WorldLocation*>(GetTargetDest()); + dest->RelocateOffset(offset); + // spirit bombs get higher + if (GetSpellInfo()->Effects[effIndex].MiscValue == NPC_SPIRIT_BOMB) + dest->RelocateOffset(offset); + } + + void Register() + { + OnEffectLaunch += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_summon_into_air_SpellScript(); + } +}; + +class spell_the_lich_king_soul_reaper : public SpellScriptLoader +{ + public: + spell_the_lich_king_soul_reaper() : SpellScriptLoader("spell_the_lich_king_soul_reaper") { } + + class spell_the_lich_king_soul_reaper_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_SOUL_REAPER_BUFF)) + return false; + return true; + } + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (Unit* caster = GetCaster()) + GetTarget()->CastSpell(caster, SPELL_SOUL_REAPER_BUFF, true); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_soul_reaper_AuraScript(); + } +}; + +class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_valkyr_target_search() : SpellScriptLoader("spell_the_lich_king_valkyr_target_search") { } + + class spell_the_lich_king_valkyr_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) + return false; + return true; + } + + bool Load() + { + _target = NULL; + return true; + } + + void SelectTarget(std::list<Unit*>& unitList) + { + if (unitList.empty()) + return; + + unitList.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id)); + if (unitList.empty()) + return; + + _target = SelectRandomContainerElement(unitList); + unitList.clear(); + unitList.push_back(_target); + GetCaster()->GetAI()->SetGUID(_target->GetGUID()); + } + + void ReplaceTarget(std::list<Unit*>& unitList) + { + unitList.clear(); + if (_target) + unitList.push_back(_target); + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetCaster()->CastSpell(GetHitUnit(), SPELL_CHARGE, true); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_valkyr_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_valkyr_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader +{ + public: + spell_the_lich_king_eject_all_passengers() : SpellScriptLoader("spell_the_lich_king_eject_all_passengers") { } + + class spell_the_lich_king_eject_all_passengers_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_eject_all_passengers_SpellScript); + + bool Load() + { + return GetCaster()->IsVehicle(); + } + + void HandleDummy(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetCaster()->GetVehicleKit()->RemoveAllPassengers(); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_eject_all_passengers_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_eject_all_passengers_SpellScript(); + } +}; + +class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader +{ + public: + spell_the_lich_king_cast_back_to_caster() : SpellScriptLoader("spell_the_lich_king_cast_back_to_caster") { } + + class spell_the_lich_king_cast_back_to_caster_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_cast_back_to_caster_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_cast_back_to_caster_SpellScript(); + } +}; + +class spell_the_lich_king_life_siphon : public SpellScriptLoader +{ + public: + spell_the_lich_king_life_siphon() : SpellScriptLoader("spell_the_lich_king_life_siphon") { } + + class spell_the_lich_king_life_siphon_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) + return false; + return true; + } + + void TriggerHeal() + { + GetHitUnit()->CastCustomSpell(SPELL_LIFE_SIPHON_HEAL, SPELLVALUE_BASE_POINT0, GetHitDamage() * 10, GetCaster(), true); + } + + void Register() + { + AfterHit += SpellHitFn(spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_life_siphon_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirits : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirits() : SpellScriptLoader("spell_the_lich_king_vile_spirits") { } + + class spell_the_lich_king_vile_spirits_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript); + + bool Load() + { + _is25Man = GetUnitOwner()->GetMap()->Is25ManRaid(); + return true; + } + + void OnPeriodic(AuraEffect const* aurEff) + { + if (_is25Man || ((aurEff->GetTickNumber() - 1) % 5)) + GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + + bool _is25Man; + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_vile_spirits_AuraScript(); + } +}; + +class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirits_visual() : SpellScriptLoader("spell_the_lich_king_vile_spirits_visual") { } + + class spell_the_lich_king_vile_spirits_visual_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirits_visual_SpellScript); + + void ModDestHeight(SpellEffIndex /*effIndex*/) + { + Position offset = {0.0f, 0.0f, 15.0f, 0.0f}; + const_cast<WorldLocation*>(GetTargetDest())->RelocateOffset(offset); + } + + void Register() + { + OnEffectLaunch += SpellEffectFn(spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirits_visual_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirit_move_target_search() : SpellScriptLoader("spell_the_lich_king_vile_spirit_move_target_search") { } + + class spell_the_lich_king_vile_spirit_move_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript); + + bool Load() + { + _target = NULL; + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + + void SelectTarget(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + _target = SelectRandomContainerElement(targets); + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + // for this spell, all units are in target map, however it should select one to attack + if (GetHitUnit() != _target) + return; + + GetCaster()->ToCreature()->AI()->AttackStart(GetHitUnit()); + GetCaster()->AddThreat(GetHitUnit(), 100000.0f); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirit_move_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptLoader +{ + public: + spell_the_lich_king_vile_spirit_damage_target_search() : SpellScriptLoader("spell_the_lich_king_vile_spirit_damage_target_search") { } + + class spell_the_lich_king_vile_spirit_damage_target_search_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript); + + bool Load() + { + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + + void CheckTargetCount(std::list<Unit*>& targets) + { + if (targets.empty()) + return; + + // this spell has SPELL_AURA_BLOCK_SPELL_FAMILY so every next cast of this + // searcher spell will be blocked + if (TempSummon* summon = GetCaster()->ToTempSummon()) + if (Unit* summoner = summon->GetSummoner()) + summoner->GetAI()->SetData(DATA_VILE, 1); + GetCaster()->CastSpell((Unit*)NULL, SPELL_SPIRIT_BURST, true); + GetCaster()->ToCreature()->DespawnOrUnsummon(3000); + GetCaster()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + } + + Unit* _target; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_vile_spirit_damage_target_search_SpellScript(); + } +}; + +class spell_the_lich_king_harvest_soul : public SpellScriptLoader +{ + public: + spell_the_lich_king_harvest_soul() : SpellScriptLoader("spell_the_lich_king_harvest_soul") { } + + class spell_the_lich_king_harvest_soul_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript); + + bool Load() + { + return GetOwner()->GetInstanceScript() != NULL; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + // m_originalCaster to allow stacking from different casters, meh + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH) + GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_harvest_soul_AuraScript(); + } +}; + +class spell_the_lich_king_lights_favor : public SpellScriptLoader +{ + public: + spell_the_lich_king_lights_favor() : SpellScriptLoader("spell_the_lich_king_lights_favor") { } + + class spell_the_lich_king_lights_favor_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_lights_favor_AuraScript); + + void OnPeriodic(AuraEffect const* /*aurEff*/) + { + if (Unit* caster = GetCaster()) + if (AuraEffect* effect = GetAura()->GetEffect(EFFECT_1)) + effect->RecalculateAmount(caster); + } + + void CalculateBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) + { + canBeRecalculated = true; + amount = 0; + if (Unit* caster = GetCaster()) + amount = int32(caster->GetHealthPct()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_lights_favor_AuraScript(); + } +}; + +class spell_the_lich_king_soul_rip : public SpellScriptLoader +{ + public: + spell_the_lich_king_soul_rip() : SpellScriptLoader("spell_the_lich_king_soul_rip") { } + + class spell_the_lich_king_soul_rip_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_soul_rip_AuraScript); + + void OnPeriodic(AuraEffect const* aurEff) + { + PreventDefaultAction(); + // shouldn't be needed, this is channeled + if (Unit* caster = GetCaster()) + caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); + } + + void Register() + { + OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_soul_rip_AuraScript(); + } +}; + +class spell_the_lich_king_restore_soul : public SpellScriptLoader +{ + public: + spell_the_lich_king_restore_soul() : SpellScriptLoader("spell_the_lich_king_restore_soul") { } + + class spell_the_lich_king_restore_soul_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript); + + bool Load() + { + _instance = GetCaster()->GetInstanceScript(); + return _instance != NULL; + } + + void HandleScript(SpellEffIndex /*effIndex*/) + { + if (Creature* lichKing = ObjectAccessor::GetCreature(*GetCaster(), _instance->GetData64(DATA_THE_LICH_KING))) + lichKing->AI()->DoAction(ACTION_TELEPORT_BACK); + if (Creature* spawner = GetCaster()->FindNearestCreature(NPC_WORLD_TRIGGER_INFINITE_AOI, 50.0f)) + spawner->RemoveAllAuras(); + } + + void RemoveAura() + { + if (Unit* target = GetHitUnit()) + target->RemoveAurasDueToSpell(target->GetMap()->IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT); + } + + void Register() + { + OnEffectHit += SpellEffectFn(spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + BeforeHit += SpellHitFn(spell_the_lich_king_restore_soul_SpellScript::RemoveAura); + } + + InstanceScript* _instance; + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_restore_soul_SpellScript(); + } +}; + +class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader +{ + public: + spell_the_lich_king_in_frostmourne_room() : SpellScriptLoader("spell_the_lich_king_in_frostmourne_room") { } + + class spell_the_lich_king_in_frostmourne_room_AuraScript : public AuraScript + { + PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript); + + bool Load() + { + return GetOwner()->GetInstanceScript() != NULL; + } + + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + // m_originalCaster to allow stacking from different casters, meh + if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH) + GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); + } + + void Register() + { + AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_the_lich_king_in_frostmourne_room_AuraScript(); + } +}; + +class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader +{ + public: + spell_the_lich_king_summon_spirit_bomb() : SpellScriptLoader("spell_the_lich_king_summon_spirit_bomb") { } + + class spell_the_lich_king_summon_spirit_bomb_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_summon_spirit_bomb_SpellScript(); + } +}; + +class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader +{ + public: + spell_the_lich_king_trigger_vile_spirit() : SpellScriptLoader("spell_the_lich_king_trigger_vile_spirit") { } + + class spell_the_lich_king_trigger_vile_spirit_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript); + + void TeleportOutside() + { + Creature* target = GetHitCreature(); + if (!target) + return; + + Position dest; + Position offset; + TerenasSpawnHeroic.GetPositionOffsetTo(*target, offset); + GetCaster()->GetPosition(&dest); + dest.RelocateOffset(offset); + target->NearTeleportTo(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.GetOrientation()); + } + + void Register() + { + OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::TeleportOutside); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_trigger_vile_spirit_SpellScript(); + } +}; + +class spell_the_lich_king_jump : public SpellScriptLoader +{ + public: + spell_the_lich_king_jump() : SpellScriptLoader("spell_the_lich_king_jump") { } + + class spell_the_lich_king_jump_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_jump_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->RemoveAurasDueToSpell(SPELL_RAISE_DEAD); + GetHitUnit()->CastSpell((Unit*)NULL, SPELL_JUMP_2, true); + if (Creature* creature = GetHitCreature()) + creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_jump_SpellScript(); + } +}; + +class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader +{ + public: + spell_the_lich_king_jump_remove_aura() : SpellScriptLoader("spell_the_lich_king_jump_remove_aura") { } + + class spell_the_lich_king_jump_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_jump_SpellScript); + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_jump_SpellScript(); + } +}; + +class spell_the_lich_king_play_movie : public SpellScriptLoader +{ + public: + spell_the_lich_king_play_movie() : SpellScriptLoader("spell_the_lich_king_play_movie") { } + + class spell_the_lich_king_play_movie_SpellScript : public SpellScript + { + PrepareSpellScript(spell_the_lich_king_play_movie_SpellScript); + + bool Validate(SpellInfo const* /*spell*/) + { + if (!sMovieStore.LookupEntry(MOVIE_FALL_OF_THE_LICH_KING)) + return false; + return true; + } + + void HandleScript(SpellEffIndex effIndex) + { + PreventHitDefaultEffect(effIndex); + if (Player* player = GetHitPlayer()) + player->SendMovieStart(MOVIE_FALL_OF_THE_LICH_KING); + } + + void Register() + { + OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_play_movie_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_the_lich_king_play_movie_SpellScript(); + } +}; + +class achievement_been_waiting_long_time : public AchievementCriteriaScript +{ + public: + achievement_been_waiting_long_time() : AchievementCriteriaScript("achievement_been_waiting_long_time") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + if (!target) + return false; + + return target->GetAI()->GetData(DATA_PLAGUE_STACK) >= 30; + } +}; + +class achievement_neck_deep_in_vile : public AchievementCriteriaScript +{ + public: + achievement_neck_deep_in_vile() : AchievementCriteriaScript("achievement_neck_deep_in_vile") { } + + bool OnCheck(Player* /*source*/, Unit* target) + { + if (!target) + return false; + + return !target->GetAI()->GetData(DATA_VILE); + } +}; + +void AddSC_boss_the_lich_king() +{ + new boss_the_lich_king(); + new npc_tirion_fordring_tft(); + new npc_shambling_horror_icc(); + new npc_raging_spirit(); + new npc_valkyr_shadowguard(); + new npc_strangulate_vehicle(); + new npc_terenas_menethil(); + new npc_spirit_warden(); + new npc_spirit_bomb(); + new npc_broken_frostmourne(); + new spell_the_lich_king_infest(); + new spell_the_lich_king_necrotic_plague(); + new spell_the_lich_king_necrotic_plague_jump(); + new spell_the_lich_king_shadow_trap_visual(); + new spell_the_lich_king_shadow_trap_periodic(); + new spell_the_lich_king_quake(); + new spell_the_lich_king_ice_burst_target_search(); + new spell_the_lich_king_raging_spirit(); + new spell_the_lich_king_defile(); + new spell_the_lich_king_summon_into_air(); + new spell_the_lich_king_soul_reaper(); + new spell_the_lich_king_valkyr_target_search(); + new spell_the_lich_king_eject_all_passengers(); + new spell_the_lich_king_cast_back_to_caster(); + new spell_the_lich_king_life_siphon(); + new spell_the_lich_king_vile_spirits(); + new spell_the_lich_king_vile_spirits_visual(); + new spell_the_lich_king_vile_spirit_move_target_search(); + new spell_the_lich_king_vile_spirit_damage_target_search(); + new spell_the_lich_king_harvest_soul(); + new spell_the_lich_king_lights_favor(); + new spell_the_lich_king_soul_rip(); + new spell_the_lich_king_restore_soul(); + new spell_the_lich_king_in_frostmourne_room(); + new spell_the_lich_king_summon_spirit_bomb(); + new spell_the_lich_king_trigger_vile_spirit(); + new spell_the_lich_king_jump(); + new spell_the_lich_king_jump_remove_aura(); + new spell_trigger_spell_from_caster("spell_the_lich_king_mass_resurrection", SPELL_MASS_RESURRECTION_REAL); + new spell_the_lich_king_play_movie(); + new achievement_been_waiting_long_time(); + new achievement_neck_deep_in_vile(); +} diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 8b2153b2006..5f62c2b5424 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1187,7 +1187,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader void FilterTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); if (targets.empty()) return; @@ -1236,7 +1236,7 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader std::list<Creature*> summoners; GetCreatureListWithEntryInGrid(summoners, caster, NPC_WORLD_TRIGGER, 100.0f); - summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); + summoners.remove_if (Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); Trinity::RandomResizeList(summoners, 2); if (summoners.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 25e77fb4506..01fe08f31e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1824,7 +1824,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { // Select valid targets for jump - unitList.remove_if(DeathPlagueTargetSelector(GetCaster())); + unitList.remove_if (DeathPlagueTargetSelector(GetCaster())); if (!unitList.empty()) { Unit* target = SelectRandomContainerElement(unitList); @@ -1913,7 +1913,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list<Unit*>& unitList) { - unitList.remove_if(AliveCheck()); + unitList.remove_if (AliveCheck()); Trinity::RandomResizeList(unitList, 2); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 26b2546fc50..ece966fcda5 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -28,22 +28,30 @@ uint32 const EncounterCount = 13; uint32 const WeeklyNPCs = 9; uint32 const MaxHeroicAttempts = 50; +// Defined in boss_valithria_dreamwalker.cpp extern Position const ValithriaSpawnPos; // Defined in boss_sindragosa.cpp extern Position const SindragosaSpawnPos; +// Defined in boss_the_lich_king.cpp +extern Position const TerenasSpawn; +extern Position const TerenasSpawnHeroic; +extern Position const SpiritWardenSpawn; // Shared spells used by more than one script enum SharedSpells { - SPELL_BERSERK = 26662, - SPELL_BERSERK2 = 47008, + SPELL_BERSERK = 26662, + SPELL_BERSERK2 = 47008, // Deathbound Ward - SPELL_STONEFORM = 70733, + SPELL_STONEFORM = 70733, // Residue Rendezvous - SPELL_ORANGE_BLIGHT_RESIDUE = 72144, - SPELL_GREEN_BLIGHT_RESIDUE = 72145, + SPELL_ORANGE_BLIGHT_RESIDUE = 72144, + SPELL_GREEN_BLIGHT_RESIDUE = 72145, + + // The Lich King + SPELL_FROSTMOURNE_TELEPORT_VISUAL = 73078, }; enum TeleporterSpells @@ -99,6 +107,9 @@ enum DataTypes DATA_CAPTAIN_RUPERT = 34, DATA_VALITHRIA_TRIGGER = 35, DATA_VALITHRIA_LICH_KING = 36, + DATA_HIGHLORD_TIRION_FORDRING = 37, + DATA_ARTHAS_PLATFORM = 38, + DATA_TERENAS_MENETHIL = 39, }; enum CreaturesIds @@ -247,7 +258,23 @@ enum CreaturesIds // The Lich King NPC_THE_LICH_KING = 36597, + NPC_HIGHLORD_TIRION_FORDRING_LK = 38995, + NPC_TERENAS_MENETHIL_FROSTMOURNE = 36823, + NPC_SPIRIT_WARDEN = 36824, + NPC_TERENAS_MENETHIL_FROSTMOURNE_H = 39217, + NPC_SHAMBLING_HORROR = 37698, + NPC_DRUDGE_GHOUL = 37695, + NPC_ICE_SPHERE = 36633, + NPC_RAGING_SPIRIT = 36701, + NPC_DEFILE = 38757, + NPC_VALKYR_SHADOWGUARD = 36609, + NPC_VILE_SPIRIT = 37799, + NPC_WICKED_SPIRIT = 39190, + NPC_STRANGULATE_VEHICLE = 36598, NPC_WORLD_TRIGGER = 22515, + NPC_WORLD_TRIGGER_INFINITE_AOI = 36171, + NPC_SPIRIT_BOMB = 39189, + NPC_FROSTMOURNE_TRIGGER = 38584, }; enum GameObjectsIds @@ -312,6 +339,20 @@ enum GameObjectsIds GO_ICE_WALL = 202396, GO_ICE_BLOCK = 201722, GO_SIGIL_OF_THE_FROSTWING = 202181, + + // The Lich King + GO_ARTHAS_PLATFORM = 202161, + GO_ARTHAS_PRECIPICE = 202078, + GO_DOODAD_ICECROWN_THRONEFROSTYWIND01 = 202188, + GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01 = 202189, + GO_DOODAD_ICESHARD_STANDING02 = 202141, + GO_DOODAD_ICESHARD_STANDING01 = 202142, + GO_DOODAD_ICESHARD_STANDING03 = 202143, + GO_DOODAD_ICESHARD_STANDING04 = 202144, + GO_DOODAD_ICECROWN_SNOWEDGEWARNING01 = 202190, + GO_FROZEN_LAVAMAN = 202436, + GO_LAVAMAN_PILLARS_CHAINED = 202437, + GO_LAVAMAN_PILLARS_UNCHAINED = 202438, }; enum AchievementCriteriaIds @@ -351,9 +392,6 @@ enum AchievementCriteriaIds enum SharedActions { - // Coldflame Traps - ACTION_STOP_TRAPS = -377440, - // Festergut ACTION_FESTERGUT_COMBAT = -366260, ACTION_FESTERGUT_GAS = -366261, @@ -374,6 +412,10 @@ enum SharedActions // Sindragosa ACTION_START_FROSTWYRM = -368530, ACTION_TRIGGER_ASPHYXIATION = -368531, + + // The Lich King + ACTION_RESTORE_LIGHT = -72262, + ACTION_FROSTMOURNE_INTRO = -36823, }; enum WeekliesICC @@ -399,6 +441,11 @@ enum WorldStatesICC WORLDSTATE_ATTEMPTS_MAX = 4942, }; +enum AreaIds +{ + AREA_THE_FROZEN_THRONE = 4859, +}; + class spell_trigger_spell_from_caster : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 41705ca0e78..90078e44d10 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -23,6 +23,20 @@ #include "PoolMgr.h" #include "icecrown_citadel.h" +enum EventIds +{ + EVENT_QUAKE = 23437, + EVENT_SECOND_REMORSELESS_WINTER = 23507, + EVENT_TELEPORT_TO_FROSMOURNE = 23617, +}; + +enum TimedEvents +{ + EVENT_UPDATE_EXECUTION_TIME = 1, + EVENT_QUAKE_SHATTER = 2, + EVENT_REBUILD_PLATFORM = 3, +}; + DoorData const doorData[] = { {GO_LORD_MARROWGAR_S_ENTRANCE, DATA_LORD_MARROWGAR, DOOR_TYPE_ROOM, BOUNDARY_N }, @@ -50,7 +64,7 @@ DoorData const doorData[] = {GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SE }, {GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SW }, - {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE},// END + {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // END }; // this doesnt have to only store questgivers, also can be used for related quest spawns @@ -116,6 +130,13 @@ class instance_icecrown_citadel : public InstanceMapScript SpinestalkerGUID = 0; RimefangGUID = 0; TheLichKingGUID = 0; + HighlordTirionFordringGUID = 0; + TerenasMenethilGUID = 0; + ArthasPlatformGUID = 0; + ArthasPrecipiceGUID = 0; + FrozenThroneEdgeGUID = 0; + FrozenThroneWindGUID = 0; + FrozenThroneWarningGUID = 0; FrostwyrmCount = 0; SpinestalkerTrashCount = 0; RimefangTrashCount = 0; @@ -125,7 +146,6 @@ class instance_icecrown_citadel : public InstanceMapScript IsOrbWhispererEligible = true; ColdflameJetsState = NOT_STARTED; BloodQuickeningState = NOT_STARTED; - BloodQuickeningTimer = 0; BloodQuickeningMinutes = 0; } @@ -269,6 +289,13 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_THE_LICH_KING: TheLichKingGUID = creature->GetGUID(); break; + case NPC_HIGHLORD_TIRION_FORDRING_LK: + HighlordTirionFordringGUID = creature->GetGUID(); + break; + case NPC_TERENAS_MENETHIL_FROSTMOURNE: + case NPC_TERENAS_MENETHIL_FROSTMOURNE_H: + TerenasMenethilGUID = creature->GetGUID(); + break; default: break; } @@ -424,6 +451,40 @@ class instance_icecrown_citadel : public InstanceMapScript case GO_DRINK_ME: PutricideTableGUID = go->GetGUID(); break; + case GO_ARTHAS_PLATFORM: + // this enables movement at The Frozen Throne, when printed this value is 0.000000f + // however, when represented as integer client will accept only this value + go->SetUInt32Value(GAMEOBJECT_PARENTROTATION, 5535469); + ArthasPlatformGUID = go->GetGUID(); + break; + case GO_ARTHAS_PRECIPICE: + go->SetUInt32Value(GAMEOBJECT_PARENTROTATION, 4178312); + ArthasPrecipiceGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYEDGE01: + FrozenThroneEdgeGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_THRONEFROSTYWIND01: + FrozenThroneWindGUID = go->GetGUID(); + break; + case GO_DOODAD_ICECROWN_SNOWEDGEWARNING01: + FrozenThroneWarningGUID = go->GetGUID(); + break; + case GO_FROZEN_LAVAMAN: + FrozenBolvarGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; + case GO_LAVAMAN_PILLARS_CHAINED: + PillarsChainedGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; + case GO_LAVAMAN_PILLARS_UNCHAINED: + PillarsUnchainedGUID = go->GetGUID(); + if (GetBossState(DATA_THE_LICH_KING) == DONE) + go->SetRespawnTime(7 * DAY); + break; default: break; } @@ -541,6 +602,12 @@ class instance_icecrown_citadel : public InstanceMapScript return RimefangGUID; case DATA_THE_LICH_KING: return TheLichKingGUID; + case DATA_HIGHLORD_TIRION_FORDRING: + return HighlordTirionFordringGUID; + case DATA_ARTHAS_PLATFORM: + return ArthasPlatformGUID; + case DATA_TERENAS_MENETHIL: + return TerenasMenethilGUID; default: break; } @@ -661,6 +728,14 @@ class instance_icecrown_citadel : public InstanceMapScript } break; case DATA_THE_LICH_KING: + { + // set the platform as active object to dramatically increase visibility range + // note: "active" gameobjects do not block grid unloading + if (GameObject* precipice = instance->GetGameObject(ArthasPrecipiceGUID)) + precipice->setActive(state == IN_PROGRESS); + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->setActive(state == IN_PROGRESS); + if (instance->IsHeroic()) { if (state == FAIL && HeroicAttempts) @@ -672,7 +747,18 @@ class instance_icecrown_citadel : public InstanceMapScript theLichKing->DespawnOrUnsummon(); } } + + if (state == DONE) + { + if (GameObject* bolvar = instance->GetGameObject(FrozenBolvarGUID)) + bolvar->SetRespawnTime(7 * DAY); + if (GameObject* pillars = instance->GetGameObject(PillarsChainedGUID)) + pillars->SetRespawnTime(7 * DAY); + if (GameObject* pillars = instance->GetGameObject(PillarsUnchainedGUID)) + pillars->SetRespawnTime(7 * DAY); + } break; + } default: break; } @@ -798,13 +884,13 @@ class instance_icecrown_citadel : public InstanceMapScript switch (data) { case IN_PROGRESS: - BloodQuickeningTimer = 60000; + Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000); BloodQuickeningMinutes = 30; DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); break; case DONE: - BloodQuickeningTimer = 0; + Events.CancelEvent(EVENT_UPDATE_EXECUTION_TIME); BloodQuickeningMinutes = 0; DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); break; @@ -1050,32 +1136,103 @@ class instance_icecrown_citadel : public InstanceMapScript void Update(uint32 diff) { - if (BloodQuickeningState == IN_PROGRESS) + if (BloodQuickeningState != IN_PROGRESS && GetBossState(DATA_THE_LICH_KING) != IN_PROGRESS) + return; + + Events.Update(diff); + + while (uint32 eventId = Events.ExecuteEvent()) { - if (BloodQuickeningTimer <= diff) + switch (eventId) { - --BloodQuickeningMinutes; - BloodQuickeningTimer = 60000; - if (BloodQuickeningMinutes) + case EVENT_UPDATE_EXECUTION_TIME: { - DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); - DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); + --BloodQuickeningMinutes; + if (BloodQuickeningMinutes) + { + Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000); + DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1); + DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); + } + else + { + BloodQuickeningState = DONE; + DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); + if (Creature* bq = instance->GetCreature(BloodQueenLanaThelGUID)) + bq->AI()->DoAction(ACTION_KILL_MINCHAR); + } + SaveToDB(); + break; } - else + case EVENT_QUAKE_SHATTER: { - BloodQuickeningState = DONE; - DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0); - if (Creature* bq = instance->GetCreature(BloodQueenLanaThelGUID)) - bq->AI()->DoAction(ACTION_KILL_MINCHAR); + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED); + if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID)) + edge->SetGoState(GO_STATE_ACTIVE); + if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID)) + wind->SetGoState(GO_STATE_READY); + if (GameObject* warning = instance->GetGameObject(FrozenThroneWarningGUID)) + warning->SetGoState(GO_STATE_READY); + if (Creature* theLichKing = instance->GetCreature(TheLichKingGUID)) + theLichKing->AI()->DoAction(ACTION_RESTORE_LIGHT); + break; } - SaveToDB(); + case EVENT_REBUILD_PLATFORM: + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + platform->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING); + if (GameObject* edge = instance->GetGameObject(FrozenThroneEdgeGUID)) + edge->SetGoState(GO_STATE_READY); + if (GameObject* wind = instance->GetGameObject(FrozenThroneWindGUID)) + wind->SetGoState(GO_STATE_ACTIVE); + break; + default: + break; } - else - BloodQuickeningTimer -= diff; + } + } + + void ProcessEvent(WorldObject* /*source*/, uint32 eventId) + { + switch (eventId) + { + case EVENT_QUAKE: + if (GameObject* warning = instance->GetGameObject(FrozenThroneWarningGUID)) + warning->SetGoState(GO_STATE_ACTIVE); + Events.ScheduleEvent(EVENT_QUAKE_SHATTER, 5000); + break; + case EVENT_SECOND_REMORSELESS_WINTER: + if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID)) + { + platform->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); + Events.ScheduleEvent(EVENT_REBUILD_PLATFORM, 1500); + } + break; + case EVENT_TELEPORT_TO_FROSMOURNE: // Harvest Soul (normal mode) + if (Creature* terenas = instance->SummonCreature(NPC_TERENAS_MENETHIL_FROSTMOURNE, TerenasSpawn, NULL, 63000)) + { + terenas->AI()->DoAction(ACTION_FROSTMOURNE_INTRO); + std::list<Creature*> triggers; + GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f); + if (!triggers.empty()) + { + triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, false)); + Unit* visual = triggers.front(); + visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true); + } + + if (Creature* warden = instance->SummonCreature(NPC_SPIRIT_WARDEN, SpiritWardenSpawn, NULL, 63000)) + { + terenas->AI()->AttackStart(warden); + warden->AddThreat(terenas, 300000.0f); + } + } + break; } } protected: + EventMap Events; uint64 LadyDeathwisperElevatorGUID; uint64 DeathbringerSaurfangGUID; uint64 DeathbringerSaurfangDoorGUID; @@ -1105,8 +1262,17 @@ class instance_icecrown_citadel : public InstanceMapScript uint64 SpinestalkerGUID; uint64 RimefangGUID; uint64 TheLichKingGUID; + uint64 HighlordTirionFordringGUID; + uint64 TerenasMenethilGUID; + uint64 ArthasPlatformGUID; + uint64 ArthasPrecipiceGUID; + uint64 FrozenThroneEdgeGUID; + uint64 FrozenThroneWindGUID; + uint64 FrozenThroneWarningGUID; + uint64 FrozenBolvarGUID; + uint64 PillarsChainedGUID; + uint64 PillarsUnchainedGUID; uint32 TeamInInstance; - uint32 BloodQuickeningTimer; uint32 ColdflameJetsState; uint32 FrostwyrmCount; uint32 SpinestalkerTrashCount; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index acd47c2e606..c2107e88b2e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -99,7 +99,7 @@ public: DoScriptText(SAY_SLAY, me); } - void JustDied(Unit* ) + void JustDied(Unit*) { _JustDied(); @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_IMPALE: //Cast Impale on a random target diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 5bd675ea0ba..0462f669d88 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -197,7 +197,7 @@ public: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->SetSpeed(MOVE_RUN, me->GetSpeedRate(MOVE_RUN), true); - switch(id) + switch (id) { case HORSEMEN_THANE: me->GetMotionMaster()->MovePoint(0, WaypointPositions[0]); @@ -347,7 +347,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_MARK: if (!(rand()%5)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index e340e1d213b..1849849d907 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -101,7 +101,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WOUND: DoCast(me->getVictim(), SPELL_MORTAL_WOUND); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 2a93d170318..bbf5b669494 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -278,7 +278,7 @@ class boss_gothik : public CreatureScript } else { - switch(entry) + switch (entry) { case MOB_LIVE_TRAINEE: { @@ -346,7 +346,7 @@ class boss_gothik : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { uint32 spellId = 0; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_LIVE_TRAINEE: spellId = SPELL_INFORM_DEAD_TRAINEE; break; case SPELL_INFORM_LIVE_KNIGHT: spellId = SPELL_INFORM_DEAD_KNIGHT; break; @@ -360,7 +360,7 @@ class boss_gothik : public CreatureScript } } - void DamageTaken(Unit* /*who*/ , uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) { if (!phaseTwo) damage = 0; @@ -371,7 +371,7 @@ class boss_gothik : public CreatureScript if (!me->isInCombat()) return; - switch(spell->Id) + switch (spell->Id) { case SPELL_INFORM_DEAD_TRAINEE: DoSummon(MOB_DEAD_TRAINEE, target, 0); @@ -405,7 +405,7 @@ class boss_gothik : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SUMMON: if (waves[waveCount].entry) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 6bb0675b7fc..3badccd3a80 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -77,7 +77,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CLOUD: DoCastAOE(SPELL_POISON_CLOUD); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index c214141cd32..bb8a0909df4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -132,7 +132,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_DISRUPT: DoCastAOE(SPELL_SPELL_DISRUPTION); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 33122567bad..7307fad3701 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -396,7 +396,7 @@ public: { while (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WASTE: DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); @@ -491,7 +491,7 @@ public: if (uint32 eventId = events.GetEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BOLT: DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); @@ -540,7 +540,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, NotCharmedTargetSelector())) { - switch(player->getClass()) + switch (player->getClass()) { case CLASS_DRUID: if (urand(0, 1)) @@ -658,7 +658,7 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->isGameMaster()) return false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8159765d9e9..6db29be8fbd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -67,7 +67,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_AURA: DoCastAOE(SPELL_NECROTIC_AURA); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 9384eb04bc8..e98b004f9e9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -98,7 +98,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_WRAP: // TODO : Add missing text diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index ca85034d36f..04627981ef3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -149,7 +149,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_CURSE: DoCastAOE(SPELL_CURSE_PLAGUEBRINGER); @@ -178,7 +178,7 @@ public: return; case EVENT_WAVE: DoScriptText(SAY_SUMMON, me); - switch(balconyCount) + switch (balconyCount) { case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 9e87ed06069..10f1b809694 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_HATEFUL: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 0d8c993ffa6..7adc17cc852 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -107,7 +107,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_STRIKE: DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index c39072ae2d1..ce9f55ae0b6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -244,7 +244,7 @@ public: { while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(EMOTE_ENRAGE, me); @@ -288,7 +288,7 @@ public: { if (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_LIFTOFF: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 9859cd758df..b8058afe488 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -151,7 +151,7 @@ public: void DoAction(const int32 action) { - switch(action) + switch (action) { case ACTION_FEUGEN_RESET: checkFeugenAlive = true; @@ -229,7 +229,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIFT: DoCastAOE(SPELL_POLARITY_SHIFT); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index f08e0ccb5cf..db9fbc5a0a1 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -169,7 +169,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 15989: SapphironGUID = creature->GetGUID(); return; case 15953: uiFaerlina = creature->GetGUID(); return; @@ -265,7 +265,7 @@ public: void SetData(uint32 id, uint32 value) { - switch(id) + switch (id) { case DATA_HEIGAN_ERUPT: HeiganErupt(value); @@ -316,7 +316,7 @@ public: uint64 GetData64(uint32 id) { - switch(id) + switch (id) { case DATA_FAERLINA: return uiFaerlina; @@ -386,7 +386,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) { - switch(criteria_id) + switch (criteria_id) { case 7600: // Criteria for achievement 2176: And They Would All Go Down Together 15sec of each other 10-man if (Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL && (maxHorsemenDiedTime - minHorsemenDiedTime) < 15) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 46bf017eb42..282e6b3eb98 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -149,7 +149,7 @@ enum MalygosSays #define MAX_HOVER_DISK_WAYPOINTS 18 -// Sniffed data (x,y,z) +// Sniffed data (x, y,z) const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { {782.9821f, 1296.652f, 282.1114f, 0.0f}, @@ -174,7 +174,7 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define GROUND_Z 268 -// Source: Sniffs (x,y,z) +// Source: Sniffs (x, y,z) #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { @@ -1049,7 +1049,7 @@ public: { MakePlayerEnter(); _entered = true; - } else + } else _timer -= diff; } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 88fe98e8370..0568bb13a8e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -162,7 +162,7 @@ class boss_anomalus : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT , me); + DoScriptText(SAY_RIFT, me); } } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 30fd0695a9f..d2130a4bada 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -151,7 +151,7 @@ public: uint32 GetData(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAGUS_TELESTRA_EVENT: return m_auiEncounter[0]; case DATA_ANOMALUS_EVENT: return m_auiEncounter[1]; @@ -218,7 +218,7 @@ public: uint64 GetData64(uint32 uiIdentifier) { - switch(uiIdentifier) + switch (uiIdentifier) { case DATA_ANOMALUS: return Anomalus; case DATA_KERISTRASZA: return Keristrasza; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index da8a6552ed3..df606f61d57 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -65,7 +65,7 @@ enum Actions ACTION_SET_NORMAL_EVENTS = 1 }; -/*Ruby Drake , +/*Ruby Drake, (npc 27756) (item 37860) (summoned by spell Ruby Essence = 37860 ---> Call Amber Drake == 49462 ---> Summon 27756) */ diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 88eda112e52..16c258af756 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -175,7 +175,7 @@ public: void SetPosition(uint8 i) { - switch(i) + switch (i) { case 0: x = me->GetPositionX() + 4; @@ -276,8 +276,8 @@ public: if (timeBombTimer <= uiDiff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit, SPELL_TIME_BOMB); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(unit, SPELL_TIME_BOMB); timeBombTimer = urand(20000, 25000); } else timeBombTimer -= uiDiff; @@ -300,7 +300,7 @@ public: void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) { - switch(pSpell->Id) + switch (pSpell->Id) { case SPELL_SUMMON_MENAGERIE: me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 14acfbec03d..a2db75d1600 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_DRAKOS: drakosGUID = creature->GetGUID(); @@ -170,7 +170,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: platformUrom = data; @@ -180,7 +180,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_UROM_PLATAFORM: return platformUrom; // used by condition system @@ -192,7 +192,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_DRAKOS: return drakosGUID; case DATA_VAROS: return varosGUID; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 765a7674823..f8839aa0028 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -58,10 +58,10 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_VERDISA: //Verdisa - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -91,7 +91,7 @@ public: } break; case NPC_BELGARISTRASZ: //Belgaristrasz - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) @@ -121,7 +121,7 @@ public: } break; case NPC_ETERNOS: //Eternos - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: if (!HAS_ESSENCE(player)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index b44ab3820fc..c091906d490 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -194,7 +194,7 @@ public: //TODO: remove when removal is done by the core void DoRemoveStanceAura(uint8 uiStance) { - switch(uiStance) + switch (uiStance) { case STANCE_DEFENSIVE: me->RemoveAurasDueToSpell(SPELL_DEFENSIVE_STANCE); @@ -230,7 +230,7 @@ public: m_uiStance = uiTempStance; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: DoScriptText(SAY_DEFENSIVE_STANCE, me); @@ -258,7 +258,7 @@ public: else m_uiChangeStance_Timer -= uiDiff; - switch(m_uiStance) + switch (m_uiStance) { case STANCE_DEFENSIVE: { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 04b09da1ca2..4e386ff9c17 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -204,7 +204,7 @@ public: // Health check if (HealthBelowPct(100 - 25 * m_uiHealthAmountModifier)) { - switch(m_uiHealthAmountModifier) + switch (m_uiHealthAmountModifier) { case 1: DoScriptText(SAY_75HEALTH, me); break; case 2: DoScriptText(SAY_50HEALTH, me); break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 0fefb28e9ab..8d7731b3eee 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -78,7 +78,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_BJARNGRIM: m_uiGeneralBjarngrimGUID = creature->GetGUID(); @@ -97,7 +97,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_BJARNGRIM_DOOR: m_uiBjarngrimDoorGUID = go->GetGUID(); @@ -135,7 +135,7 @@ public: void SetData(uint32 uiType, uint32 uiData) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: if (uiData == DONE) @@ -175,7 +175,7 @@ public: uint32 GetData(uint32 uiType) { - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: return m_auiEncounter[0]; @@ -191,7 +191,7 @@ public: uint64 GetData64(uint32 uiData) { - switch(uiData) + switch (uiData) { case DATA_BJARNGRIM: return m_uiGeneralBjarngrimGUID; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 044c01b6687..e5f3cfd7229 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -348,7 +348,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 7: if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) @@ -380,7 +380,7 @@ public: void SpawnDwarf(uint32 uiType) { - switch(uiType) + switch (uiType) { case 1: { @@ -439,7 +439,7 @@ public: { if (uiPhaseTimer <= uiDiff) { - switch(uiStep) + switch (uiStep) { case 1: if (pInstance) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 9285d852404..e46a7dae107 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -91,7 +91,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_MAIDEN: uiMaidenOfGrief = creature->GetGUID(); break; case CREATURE_KRYSTALLUS: uiKrystallus = creature->GetGUID(); break; @@ -105,7 +105,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ABEDNEUM: uiAbedneumGo = go->GetGUID(); @@ -154,7 +154,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; @@ -187,7 +187,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_KRYSTALLUS_EVENT: return m_auiEncounter[0]; case DATA_MAIDEN_OF_GRIEF_EVENT: return m_auiEncounter[1]; @@ -200,7 +200,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAIDEN_OF_GRIEF: return uiMaidenOfGrief; case DATA_KRYSTALLUS: return uiKrystallus; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 244c6a579a2..2c99b4d7246 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -229,7 +229,7 @@ public: { if (uiPhase_timer <= diff) { - switch(uiStep) + switch (uiStep) { case 1: DoScriptText(SAY_SUMMON_1, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 828cf65beec..2e2ca25385c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -653,7 +653,7 @@ class boss_stormcaller_brundir : public CreatureScript while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoScriptText(SAY_BRUNDIR_BERSERK, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 685870d6d44..bcc417c50cd 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -121,7 +121,7 @@ class boss_auriaya : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); events.ScheduleEvent(EVENT_BLAST, urand(20000, 25000)); @@ -332,8 +332,8 @@ class npc_sanctum_sentry : public CreatureScript void Reset() { - events.ScheduleEvent(EVENT_RIP, urand(4000,8000)); - events.ScheduleEvent(EVENT_POUNCE, urand(12000,15000)); + events.ScheduleEvent(EVENT_RIP, urand(4000, 8000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000)); } void EnterCombat(Unit* /*who*/) @@ -366,7 +366,7 @@ class npc_sanctum_sentry : public CreatureScript me->AI()->AttackStart(target); DoCast(target, SPELL_SAVAGE_POUNCE); } - events.ScheduleEvent(EVENT_POUNCE, urand(12000,17000)); + events.ScheduleEvent(EVENT_POUNCE, urand(12000, 17000)); break; default: break; @@ -492,7 +492,7 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(SanctumSentryCheck()); + unitList.remove_if (SanctumSentryCheck()); } void Register() @@ -518,7 +518,7 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() 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 aa9516d479f..50f866ea920 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -541,9 +541,6 @@ class boss_flame_leviathan : public CreatureScript //! I also removed the spellInfo check void DoBatteringRamIfReady() { - if (me->HasUnitState(UNIT_STAT_CASTING)) - return; - if (me->isAttackReady()) { Unit* target = ObjectAccessor::GetUnit(*me, _pursueTarget); @@ -655,7 +652,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if(CanAIAttack(target)) + if (CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); NapalmTimer = 5000; @@ -1662,8 +1659,23 @@ class spell_pursue : public SpellScriptLoader { targets.remove_if(FlameLeviathanPursuedTargetSelector(GetCaster())); if (targets.empty()) + { if (Creature* caster = GetCaster()->ToCreature()) caster->AI()->EnterEvadeMode(); + } + else + { + //! In the end, only one target should be selected + _target = SelectRandomContainerElement(targets); + FilterTargetsSubsequently(targets); + } + } + + void FilterTargetsSubsequently(std::list<Unit*>& targets) + { + ASSERT(_target); + targets.clear(); + targets.push_back(_target); } void HandleScript(SpellEffIndex /*eff*/) @@ -1673,7 +1685,7 @@ class spell_pursue : public SpellScriptLoader return; caster->AI()->AttackStart(GetHitUnit()); // Chase target - + for (SeatMap::const_iterator itr = caster->GetVehicleKit()->Seats.begin(); itr != caster->GetVehicleKit()->Seats.end(); ++itr) { if (IS_PLAYER_GUID(itr->second.Passenger)) @@ -1687,8 +1699,11 @@ class spell_pursue : public SpellScriptLoader void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_pursue_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } + + Unit* _target; }; SpellScript* GetSpellScript() const diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 761eed86382..33f265419e6 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -381,17 +381,19 @@ class boss_freya : public CreatureScript } } - if (Elder[0]->isAlive()) + if (Elder[0] && Elder[0]->isAlive()) { Elder[0]->CastSpell(me, SPELL_BRIGHTLEAF_ESSENCE, true); events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(10000, 20000)); } - if (Elder[1]->isAlive()) + + if (Elder[1] && Elder[1]->isAlive()) { Elder[1]->CastSpell(me, SPELL_STONEBARK_ESSENCE, true); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(10000, 20000)); } - if (Elder[2]->isAlive()) + + if (Elder[2] && Elder[2]->isAlive()) { Elder[2]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(10000, 20000)); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 2331cc9a68c..b8876ae577a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -398,9 +398,9 @@ class npc_scorch_ground : public CreatureScript { if (_heat) { - if(_heatTimer <= uiDiff) + if (_heatTimer <= uiDiff) { - Creature* construct = me->GetCreature(*me , _constructGUID); + Creature* construct = me->GetCreature(*me, _constructGUID); if (construct && !construct->HasAura(SPELL_MOLTEN)) { me->AddAura(SPELL_HEAT, construct); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index bdabaddfcf9..5da1c485986 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -270,7 +270,7 @@ class boss_kologarn : public CreatureScript break; case EVENT_STONE_SHOUT: DoCast(SPELL_STONE_SHOUT); - events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS); break; case EVENT_ENRAGE: DoCast(SPELL_BERSERK); @@ -352,7 +352,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit* , bool> +class StoneGripTargetSelector : public std::unary_function<Unit*, bool> { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} @@ -391,7 +391,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void FilterTargetsInitial(std::list<Unit*>& unitList) { // Remove "main tank" and non-player targets - unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + unitList.remove_if (StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); // Maximum affected targets per difficulty mode uint32 maxTargets = 1; if (GetSpellInfo()->Id == 63981) @@ -601,7 +601,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index c58f2a24b9c..ae803b24642 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -947,7 +947,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(PlayerOrPetCheck()); + unitList.remove_if (PlayerOrPetCheck()); } void Register() diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 251a18e98f2..50c6caffa04 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -23,7 +23,7 @@ static DoorData const doorData[] = { { GO_LEVIATHAN_DOOR, BOSS_LEVIATHAN, DOOR_TYPE_ROOM, BOUNDARY_S }, - { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, + { GO_XT_002_DOOR, BOSS_XT002, DOOR_TYPE_ROOM, BOUNDARY_S }, { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }, }; @@ -104,7 +104,6 @@ class instance_ulduar : public InstanceMapScript AlgalonGUID = 0; KologarnChestGUID = 0; KologarnBridgeGUID = 0; - KologarnChestGUID = 0; ThorimChestGUID = 0; HodirRareCacheGUID = 0; HodirChestGUID = 0; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index cff57563843..4eaed6c9fad 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -169,7 +169,7 @@ enum UlduarData { // Collosus (Leviathan) DATA_COLOSSUS = 20, - + // Razorscale DATA_EXPEDITION_COMMANDER, DATA_RAZORSCALE_CONTROL, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 4e6a6fb72c5..b3e12415fdc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -309,10 +309,10 @@ public: void Reset() { me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); - me->SetSpeed(MOVE_SWIM , 1.0f); - me->SetSpeed(MOVE_RUN , 1.0f); - me->SetSpeed(MOVE_WALK , 1.0f); - //me->SetSpeed(MOVE_FLIGHT , 1.0f); + me->SetSpeed(MOVE_SWIM, 1.0f); + me->SetSpeed(MOVE_RUN, 1.0f); + me->SetSpeed(MOVE_WALK, 1.0f); + //me->SetSpeed(MOVE_FLIGHT, 1.0f); me->GetPosition(x, y, z); DoTeleportTo(x+1, y, z+30); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 639ff4e07d3..029ebbfe8bc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -219,11 +219,11 @@ public: DoScriptText(SAY_SKELETONS, me); for (uint8 i = 0; i < 5; ++i) { - Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1], SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (Skeleton) { Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); + Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); Skeleton->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Skeleton); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index b8e595a3452..89bad9e7068 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -124,7 +124,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 23953: Keleseth = creature->GetGUID(); break; case 24201: Dalronn = creature->GetGUID(); break; @@ -135,7 +135,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); @@ -165,7 +165,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_PRINCEKELESETH: return Keleseth; case DATA_DALRONN: return Dalronn; @@ -178,7 +178,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: m_auiEncounter[0] = data; @@ -246,7 +246,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_PRINCEKELESETH_EVENT: return m_auiEncounter[0]; case DATA_SKARVALD_DALRONN_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index cbdb1743e3e..34041445266 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -56,7 +56,7 @@ public: { if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); @@ -76,7 +76,7 @@ public: if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, DONE); @@ -96,7 +96,7 @@ public: if (fm_Type == 0) fm_Type = GetForgeMasterType(); if (pInstance) { - switch(fm_Type) + switch (fm_Type) { case 1: pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); @@ -109,7 +109,7 @@ public: break; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index c93b9c7bda6..e0164f46bd8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -780,7 +780,7 @@ public: if (currentPhase<5&¤tPhase >= 0) { Creature* pNext = NULL; - switch(currentPhase) + switch (currentPhase) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; @@ -811,7 +811,7 @@ public: if (id > 4) return; Creature* pNext = NULL; - switch(id) + switch (id) { case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 325dd67443f..1de46ca9de3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -286,7 +286,7 @@ public: Phase = SKADI; me->SetFlying(false); me->Unmount(); - if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(0); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -304,7 +304,7 @@ public: void UpdateAI(const uint32 diff) { - switch(Phase) + switch (Phase) { case FLYING: if (!UpdateVictim()) @@ -340,7 +340,7 @@ public: if (m_uiMovementTimer <= diff) { - switch(m_uiWaypointId) + switch (m_uiWaypointId) { case 0: me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index e021936fcc4..4bfd2d53761 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -219,7 +219,7 @@ public: pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - switch(m_uiActiveOrder[m_uiActivedNumber]) + switch (m_uiActiveOrder[m_uiActivedNumber]) { case 0: m_bIsActiveWithBJORN = true; break; case 1: m_bIsActiveWithHALDOR = true; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 2eff50c1f8e..5cc68e20f9f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -104,7 +104,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = creature->GetGUID(); break; case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = creature->GetGUID(); break; @@ -121,7 +121,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case ENTRY_SKADI_THE_RUTHLESS_DOOR: uiSkadiTheRuthlessDoor = go->GetGUID(); @@ -144,7 +144,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: m_auiEncounter[0] = data; @@ -176,7 +176,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0]; case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1]; @@ -188,7 +188,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave; case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 1e17103d23d..7ba12847750 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -168,6 +168,9 @@ class achievement_defenseless : public AchievementCriteriaScript bool OnCheck(Player* /*player*/, Unit* target) { + if(!target) + return false; + InstanceScript* instance = target->GetInstanceScript(); if (!instance) return false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 562a5930535..1bf13ffd5ce 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -157,7 +157,7 @@ public: if (!me->isAlive()) return; - switch(param) + switch (param) { case ACTION_WATER_ELEMENT_HIT: me->ModifyHealth(int32(me->CountPctFromMaxHealth(1))); @@ -371,7 +371,7 @@ public: { if (Creature* pIchoron = Unit::GetCreature(*me, pInstance->GetData64(DATA_ICHORON))) { - if (me->IsWithinDist(pIchoron, 2.0f , false)) + if (me->IsWithinDist(pIchoron, 2.0f, false)) { if (pIchoron->AI()) pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_HIT); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 1af9063a71b..a49462813f2 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -99,7 +99,7 @@ public: void DespawnSphere() { std::list<Creature*> assistList; - GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE , 150.0f); + GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE, 150.0f); if (assistList.empty()) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 318876d79e7..b02ea4bfc48 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -137,8 +137,8 @@ public: if (SpellVoidShiftTimer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_VOID_SHIFT); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_VOID_SHIFT); SpellVoidShiftTimer = 20000; } else SpellVoidShiftTimer -=diff; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index b6e40f21c6e..ad295ec1a9a 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -228,7 +228,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case CREATURE_XEVOZZ: uiXevozz = creature->GetGUID(); @@ -273,7 +273,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_EREKEM_GUARD_1_DOOR: uiErekemLeftGuardCell = go->GetGUID(); @@ -311,7 +311,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, CREATURE_EREKEM, NULL); @@ -354,13 +354,13 @@ public: NpcAtDoorCastingList.push_back(data); break; case DATA_NPC_PRESENCE_AT_DOOR_REMOVE: - if(!NpcAtDoorCastingList.empty()) + if (!NpcAtDoorCastingList.empty()) NpcAtDoorCastingList.pop_back(); break; case DATA_MAIN_DOOR: if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor)) { - switch(data) + switch (data) { case GO_STATE_ACTIVE: pMainDoor->SetGoState(GO_STATE_ACTIVE); @@ -375,7 +375,7 @@ public: } break; case DATA_START_BOSS_ENCOUNTER: - switch(uiWaveCount) + switch (uiWaveCount) { case 6: StartBossEncounter(uiFirstBoss); @@ -404,7 +404,7 @@ public: void SetData64(uint32 type, uint64 data) { - switch(type) + switch (type) { case DATA_ADD_TRASH_MOB: trashMobs.insert(data); @@ -417,7 +417,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_1ST_BOSS_EVENT: return m_auiEncounter[0]; case DATA_2ND_BOSS_EVENT: return m_auiEncounter[1]; @@ -438,7 +438,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MORAGG: return uiMoragg; case DATA_EREKEM: return uiErekem; @@ -470,7 +470,7 @@ public: { SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1, 5))%6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) - if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -478,7 +478,7 @@ public: { Creature* pBoss = NULL; - switch(uiBoss) + switch (uiBoss) { case BOSS_MORAGG: HandleGameObject(uiMoraggCell, bForceRespawn); @@ -565,14 +565,14 @@ public: DoUpdateWorldState(WORLD_STATE_VH, 1); DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, uiWaveCount); - switch(uiWaveCount) + switch (uiWaveCount) { case 6: if (uiFirstBoss == 0) uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -586,7 +586,7 @@ public: } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { - if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) uiSaboteurPortal = pPortal->GetGUID(); if (Creature* pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN)) pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false); @@ -733,7 +733,7 @@ public: { if (uiCyanigosaEventTimer <= diff) { - switch(uiCyanigosaEventPhase) + switch (uiCyanigosaEventPhase) { case 1: pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false); @@ -766,9 +766,9 @@ public: if (GetData(DATA_NPC_PRESENCE_AT_DOOR) && uiMainEventPhase == IN_PROGRESS) { // if door integrity is > 0 then decrase it's integrity state - if(GetData(DATA_DOOR_INTEGRITY)) + if (GetData(DATA_DOOR_INTEGRITY)) { - if(uiDoorSpellTimer < diff) + if (uiDoorSpellTimer < diff) { SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 819681e1ef2..3270941ba3e 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -256,7 +256,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->CLOSE_GOSSIP_MENU(); @@ -347,7 +347,7 @@ public: { if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: DoScriptText(SAY_SINCLARI_1, me); @@ -449,30 +449,30 @@ public: void WaypointReached(uint32 uiWPointId) { - switch(uiBoss) + switch (uiBoss) { case 1: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 2: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 3: - if(uiWPointId == 1) + if (uiWPointId == 1) FinishPointReached(); break; case 4: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 5: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 6: - if(uiWPointId == 4) + if (uiWPointId == 4) FinishPointReached(); break; } @@ -485,23 +485,23 @@ public: npc_escortAI::UpdateAI(diff); - if(!bHasGotMovingPoints) + if (!bHasGotMovingPoints) { bHasGotMovingPoints = true; - switch(uiBoss) + switch (uiBoss) { case 1: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos1[i][0], SaboteurFinalPos1[i][1], SaboteurFinalPos1[i][2], 0); me->SetHomePosition(SaboteurFinalPos1[2][0], SaboteurFinalPos1[2][1], SaboteurFinalPos1[2][2], 4.762346f); break; case 2: - for(int i=0;i<3;i++) + for (int i=0;i<3;i++) AddWaypoint(i, SaboteurFinalPos2[i][0], SaboteurFinalPos2[i][1], SaboteurFinalPos2[i][2], 0); me->SetHomePosition(SaboteurFinalPos2[2][0], SaboteurFinalPos2[2][1], SaboteurFinalPos2[2][2], 1.862674f); break; case 3: - for(int i=0;i<2;i++) + for (int i=0;i<2;i++) AddWaypoint(i, SaboteurFinalPos3[i][0], SaboteurFinalPos3[i][1], SaboteurFinalPos3[i][2], 0); me->SetHomePosition(SaboteurFinalPos3[1][0], SaboteurFinalPos3[1][1], SaboteurFinalPos3[1][2], 5.500638f); break; @@ -514,7 +514,7 @@ public: me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: - for(int i=0;i<5;i++) + for (int i=0;i<5;i++) AddWaypoint(i, SaboteurFinalPos6[i][0], SaboteurFinalPos6[i][1], SaboteurFinalPos6[i][2], 0); me->SetHomePosition(SaboteurFinalPos6[4][0], SaboteurFinalPos6[4][1], SaboteurFinalPos6[4][2], 0.983031f); break; @@ -590,7 +590,7 @@ public: if ((uiWaveCount == 6) || (uiWaveCount == 12)) //Don't spawn mobs on boss encounters return; - switch(uiTypeOfMobsPortal) + switch (uiTypeOfMobsPortal) { // spawn elite mobs and then set portals visibility to make it look like it dissapeard case 0: @@ -692,7 +692,7 @@ struct violet_hold_trashAI : public npc_escortAI void WaypointReached(uint32 uiPointId) { - switch(portalLocationID) + switch (portalLocationID) { case 0: if (uiPointId == 5) @@ -729,46 +729,46 @@ struct violet_hold_trashAI : public npc_escortAI if (!bHasGotMovingPoints) { bHasGotMovingPoints = true; - switch(portalLocationID) + switch (portalLocationID) { case 0: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FirstPortalWPs[i][0]+irand(-1, 1), FirstPortalWPs[i][1]+irand(-1, 1), FirstPortalWPs[i][2]+irand(-1, 1), 0); me->SetHomePosition(FirstPortalWPs[5][0], FirstPortalWPs[5][1], FirstPortalWPs[5][2], 3.149439f); break; case 1: secondPortalRouteID = urand(0, 1); - switch(secondPortalRouteID) + switch (secondPortalRouteID) { case 0: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, SecondPortalFirstWPs[i][0]+irand(-1, 1), SecondPortalFirstWPs[i][1]+irand(-1, 1), SecondPortalFirstWPs[i][2], 0); me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1, 1), SecondPortalFirstWPs[8][1]+irand(-1, 1), SecondPortalFirstWPs[8][2]+irand(-1, 1), 3.149439f); break; case 1: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, SecondPortalSecondWPs[i][0]+irand(-1, 1), SecondPortalSecondWPs[i][1]+irand(-1, 1), SecondPortalSecondWPs[i][2], 0); me->SetHomePosition(SecondPortalSecondWPs[7][0], SecondPortalSecondWPs[7][1], SecondPortalSecondWPs[7][2], 3.149439f); break; } break; case 2: - for(int i=0;i<8;i++) + for (int i=0;i<8;i++) AddWaypoint(i, ThirdPortalWPs[i][0]+irand(-1, 1), ThirdPortalWPs[i][1]+irand(-1, 1), ThirdPortalWPs[i][2], 0); me->SetHomePosition(ThirdPortalWPs[7][0], ThirdPortalWPs[7][1], ThirdPortalWPs[7][2], 3.149439f); break; case 3: - for(int i=0;i<9;i++) + for (int i=0;i<9;i++) AddWaypoint(i, FourthPortalWPs[i][0]+irand(-1, 1), FourthPortalWPs[i][1]+irand(-1, 1), FourthPortalWPs[i][2], 0); me->SetHomePosition(FourthPortalWPs[8][0], FourthPortalWPs[8][1], FourthPortalWPs[8][2], 3.149439f); break; case 4: - for(int i=0;i<6;i++) + for (int i=0;i<6;i++) AddWaypoint(i, FifthPortalWPs[i][0]+irand(-1, 1), FifthPortalWPs[i][1]+irand(-1, 1), FifthPortalWPs[i][2], 0); me->SetHomePosition(FifthPortalWPs[5][0], FifthPortalWPs[5][1], FifthPortalWPs[5][2], 3.149439f); break; case 5: - for(int i=0;i<4;i++) + for (int i=0;i<4;i++) AddWaypoint(i, SixthPoralWPs[i][0]+irand(-1, 1), SixthPoralWPs[i][1]+irand(-1, 1), SixthPoralWPs[i][2], 0); me->SetHomePosition(SixthPoralWPs[3][0], SixthPoralWPs[3][1], SixthPoralWPs[3][2], 3.149439f); break; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 5c7dc9abfda..a0d64e38d49 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -739,7 +739,7 @@ public: { if (IntroTimer <= diff) { - switch(IntroPhase) + switch (IntroPhase) { case 1: //DoScriptText(SAY_WP_1_LUR_START, me); @@ -1021,7 +1021,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 3: SetEscortPaused(true); @@ -1706,12 +1706,12 @@ public: { } - void SpellHit(Unit* pUnit, const SpellInfo* pSpell) + void SpellHit(Unit* unit, const SpellInfo* pSpell) { - if (pSpell->Id == SPELL_NEURAL_NEEDLE && pUnit->GetTypeId() == TYPEID_PLAYER) + if (pSpell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) { ++uiPhase; - CasterGUID = pUnit->GetGUID(); + CasterGUID = unit->GetGUID(); } } @@ -1861,7 +1861,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 10: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); @@ -1962,7 +1962,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 29: if (player) @@ -2282,7 +2282,7 @@ public: std::list<Creature*> orbList; GetCreatureListWithEntryInGrid(orbList, me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_WARMAGE_HOLLISTER: { @@ -2440,10 +2440,10 @@ public: { if (uiEventTimer && uiEventTimer <= uiDiff) { - switch(uiEventPhase) + switch (uiEventPhase) { case 1: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); @@ -2464,7 +2464,7 @@ public: } break; case 2: - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: DoScriptText(SAY_HIDDEN_CULTIST_4, me); @@ -2510,7 +2510,7 @@ public: uint32 uiGossipText = 0; const char* charGossipItem; - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_TOM_HEGGER: uiGossipText = GOSSIP_TEXT_TOM_HEGGER; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index d7b90fc4a44..6ed452857aa 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -68,7 +68,7 @@ public: if (player->GetQuestStatus(QUEST_CHILDREN_OF_URSOC) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_BEAR_GODS_OFFSPRING) == QUEST_STATUS_INCOMPLETE) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_ORSONN: if (!player->GetReqKillOrCastCurrentCount(QUEST_CHILDREN_OF_URSOC, NPC_ORSONN_CREDIT) || !player->GetReqKillOrCastCurrentCount(QUEST_THE_BEAR_GODS_OFFSPRING, NPC_ORSONN_CREDIT)) @@ -96,7 +96,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -351,7 +351,7 @@ public: { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { - switch(Who->GetEntry()) + switch (Who->GetEntry()) { case NPC_HUNGRY_WORG: DoScriptText(SAY_WORGHAGGRO2, Emily); @@ -481,6 +481,7 @@ public: } m_uiPhase = 0; } + DoMeleeAttackIfReady(); } }; @@ -527,7 +528,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_LOOT); @@ -601,7 +602,7 @@ public: { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); - if(me->IsStandState()) + if (me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else { diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1fceeb0303d..aa391712ad1 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -102,7 +102,7 @@ public: Player* player = GetPlayerForEscort(); if (!player) return; - switch(i) + switch (i) { case 1: me->SetReactState(REACT_AGGRESSIVE); @@ -306,7 +306,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 9ca2a2a5349..27054b5755a 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -78,7 +78,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARETE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -311,7 +311,7 @@ public: uiCast = true; Creature* target = NULL; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_PRIESTESS_ALORAH: target = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); @@ -399,7 +399,7 @@ public: struct npc_vereth_the_cunningAI : public ScriptedAI { - npc_vereth_the_cunningAI(Creature* pCreature) : ScriptedAI(pCreature) {} + npc_vereth_the_cunningAI(Creature* creature) : ScriptedAI(creature) {} void MoveInLineOfSight(Unit* who) { @@ -413,7 +413,7 @@ public: { owner->ToPlayer()->KilledMonsterCredit(NPC_GEIST_RETURN_BUNNY_KC, 0); who->ToCreature()->DisappearAndDie(); - + } } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 54d54d5a493..269ff05090e 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -36,7 +36,7 @@ class npc_four_car_garage : public CreatureScript { uint32 spellId = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_DEMOLISHER: spellId = SPELL_DRIVING_CREDIT_DEMOLISHER; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index dc0b3c0e032..5d38bcf9f16 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -77,7 +77,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 1: SetRun(); break; case 10: @@ -210,7 +210,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_VEKJIK_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index fdd9c626ac1..687f7945e4c 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -507,12 +507,12 @@ public: player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if( creature->isTrainer() ) + if ( creature->isTrainer() ) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if( creature->isVendor() ) - if(player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) + if ( creature->isVendor() ) + if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -522,7 +522,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRAIN: player->GetSession()->SendTrainerList(creature->GetGUID()); @@ -769,7 +769,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript else _accessoryRespawnTimer -= diff; } - + private: uint32 _accessoryRespawnTimer; Vehicle* _vehicleKit; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 6667a7751e1..193c699f930 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -371,10 +371,10 @@ public: bRemoveFlag = true; me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - switch(uiId) + switch (uiId) { case 1: - switch(uiValue) + switch (uiValue) { case QUEST_AMPHITHEATER_ANGUISH_TUSKARRMAGEDDON: DoScriptText(SAY_QUEST_ACCEPT_TUSKARRMAGEDON, me); @@ -425,7 +425,7 @@ public: if (uiTimer <= uiDiff) { - switch(uiPhase) + switch (uiPhase) { case 1: if (Creature* summon = me->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) @@ -656,7 +656,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP , me); + DoScriptText(SAY_CALL_FOR_HELP, me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) @@ -669,7 +669,7 @@ public: void JustSummoned(Creature* summon) { - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case NPC_WHISKER: summon->AI()->AttackStart(me->getVictim()); @@ -743,7 +743,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 6: me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); @@ -839,12 +839,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -937,7 +937,7 @@ public: void WaypointReached(uint32 uiI) { - switch(uiI) + switch (uiI) { case 7: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -961,12 +961,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -1083,7 +1083,7 @@ public: } - void EnterCombat(Unit* pUnit) + void EnterCombat(Unit* unit) { if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) @@ -1091,7 +1091,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(unit); } } } @@ -1106,12 +1106,12 @@ public: std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276f) + if (unit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit, 5.0f); + me->AddThreat(unit, 5.0f); break; } EnterEvadeMode(); @@ -1316,7 +1316,7 @@ public: { if (m_uiTimer <= uiDiff) { - switch(m_uiPhase) + switch (m_uiPhase) { case 1: // say random text diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 2cfedc14b14..b78811ce6a0 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -120,11 +120,11 @@ void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_EWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_EWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_EWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_EWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_EWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_EWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_EWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_EWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player* player) @@ -269,11 +269,11 @@ void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_NPT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_NPT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_NPT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_NPT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_NPT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_NPT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_NPT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_NPT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player* player) @@ -319,7 +319,7 @@ OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP* pvp) void OPvPCapturePointEP_CGT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) + if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->SetControlledState(EP_CGT, 0); @@ -401,11 +401,11 @@ void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_CGT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_CGT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_CGT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_CGT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_CGT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_CGT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_CGT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_CGT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player* player) @@ -540,11 +540,11 @@ void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointEP_PWT::UpdateTowerState() { - m_PvP->SendUpdateWorldState(EP_PWT_A , bool(m_TowerState & EP_TS_A)); - m_PvP->SendUpdateWorldState(EP_PWT_H , bool(m_TowerState & EP_TS_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N_A , bool(m_TowerState & EP_TS_N_A)); - m_PvP->SendUpdateWorldState(EP_PWT_N_H , bool(m_TowerState & EP_TS_N_H)); - m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N)); + m_PvP->SendUpdateWorldState(EP_PWT_A, bool(m_TowerState & EP_TS_A)); + m_PvP->SendUpdateWorldState(EP_PWT_H, bool(m_TowerState & EP_TS_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N_A, bool(m_TowerState & EP_TS_N_A)); + m_PvP->SendUpdateWorldState(EP_PWT_N_H, bool(m_TowerState & EP_TS_N_H)); + m_PvP->SendUpdateWorldState(EP_PWT_N, bool(m_TowerState & EP_TS_N)); } bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player* player) @@ -579,7 +579,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]); //Spawn flight master as friendly to capturing team c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); - if(c) + if (c) { GossipOption gso; gso.Action = GOSSIP_OPTION_OUTDOORPVP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 343027a02c8..a868e46b890 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -166,7 +166,7 @@ void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointHP::ChangeState() { uint32 field = 0; - switch(m_OldState) + switch (m_OldState) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -205,7 +205,7 @@ void OPvPCapturePointHP::ChangeState() } uint32 artkit = 21; uint32 artkit2 = HP_TowerArtKit_N[m_TowerType]; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: field = HP_MAP_N[m_TowerType]; @@ -282,7 +282,7 @@ void OPvPCapturePointHP::SendChangePhase() void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data) { - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: case OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 17a5e9940be..c081f0970f2 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -46,7 +46,7 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() uint32 cnt = 0; for (std::map<uint32, uint64>::iterator itr = m_Creatures.begin(); itr != m_Creatures.end(); ++itr) { - switch(itr->first) + switch (itr->first) { case NA_NPC_GUARD_01: case NA_NPC_GUARD_02: @@ -335,7 +335,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO std::vector<uint32> nodes; nodes.resize(2); bool retval = false; - switch(spellId) + switch (spellId) { case NA_SPELL_FLY_NORTH: nodes[0] = FlightPathStartNodes[NA_ROOST_N]; @@ -423,7 +423,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, uint64 guid) int32 add = -1; int32 add2 = -1; - switch(retval) + switch (retval) { case NA_DESTROYED_ROOST_S: del = NA_DESTROYED_ROOST_S; @@ -569,7 +569,7 @@ bool OPvPCapturePointNA::Update(uint32 diff) void OPvPCapturePointNA::ChangeState() { uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_NEUTRAL: m_HalaaState = HALAA_N; @@ -621,16 +621,16 @@ void OPvPCapturePointNA::SendChangePhase() void OPvPCapturePointNA::UpdateHalaaWorldState() { - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL , uint32(bool(m_HalaaState & HALAA_N))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A , uint32(bool(m_HalaaState & HALAA_N_A))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H , uint32(bool(m_HalaaState & HALAA_N_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE , uint32(bool(m_HalaaState & HALAA_H))); - m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE , uint32(bool(m_HalaaState & HALAA_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, uint32(bool(m_HalaaState & HALAA_N))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, uint32(bool(m_HalaaState & HALAA_N_A))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, uint32(bool(m_HalaaState & HALAA_N_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_HORDE, uint32(bool(m_HalaaState & HALAA_H))); + m_PvP->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, uint32(bool(m_HalaaState & HALAA_A))); } void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) { - switch(roost) + switch (roost) { case NA_ROOST_S: m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 88a820f4492..7727f761588 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -83,7 +83,7 @@ void OutdoorPvPSI::HandlePlayerLeaveZone(Player* player, uint32 zone) bool OutdoorPvPSI::HandleAreaTrigger(Player* player, uint32 trigger) { - switch(trigger) + switch (trigger) { case SI_AREATRIGGER_A: if (player->GetTeam() == ALLIANCE && player->HasAura(SI_SILITHYST_FLAG)) @@ -144,7 +144,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) if (spellId == SI_SILITHYST_FLAG) { // if it was dropped away from the player's turn-in point, then create a silithyst mound, if it was dropped near the areatrigger, then it was dispelled by the outdoorpvp, so do nothing - switch(player->GetTeam()) + switch (player->GetTeam()) { case ALLIANCE: { @@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId) delete go; return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask() , player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, player->GetPhaseMask(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 6b9c0500fc4..56895951665 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -287,7 +287,7 @@ void OPvPCapturePointTF::ChangeState() uint32 artkit = 21; - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 2866a341903..7d15f1edc40 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -88,7 +88,7 @@ void OPvPCapturePointZM_Beacon::ChangeState() sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } - switch(m_State) + switch (m_State) { case OBJECTIVESTATE_ALLIANCE: { @@ -294,7 +294,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) return; m_BothControllingFaction = controlling_faction; - switch(controlling_faction) + switch (controlling_faction) { case ALLIANCE: // if ally already controls the gy and taken back both beacons, return, nothing to do for us @@ -376,7 +376,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, uint64 gui bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spellId) { - switch(spellId) + switch (spellId) { case ZM_BATTLE_STANDARD_A: m_FlagCarrierGUID = 0; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 55aca9695cd..068875924f2 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -74,7 +74,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_IKISSDOOREVENT: if (data == DONE) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 3288c1336e9..f5b113cfff5 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -82,7 +82,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case REFECTORY_DOOR: m_uiRefectoryDoorGUID = go->GetGUID(); @@ -99,7 +99,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18732: m_uiGrandmasterVorpil = creature->GetGUID(); @@ -116,7 +116,7 @@ public: void SetData(uint32 type, uint32 uiData) { - switch(type) + switch (type) { case TYPE_HELLMAW: m_auiEncounter[0] = uiData; @@ -179,7 +179,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HELLMAW: return m_auiEncounter[0]; case TYPE_OVERSEER: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 66ef35f7400..21ecab02293 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -185,14 +185,14 @@ public: void RevertThreatOnTarget(uint64 guid) { - Unit* pUnit = NULL; - pUnit = Unit::GetUnit((*me), guid); - if (pUnit) + Unit* unit = NULL; + unit = Unit::GetUnit((*me), guid); + if (unit) { - if (DoGetThreat(pUnit)) - DoModifyThreatPercent(pUnit, -100); + if (DoGetThreat(unit)) + DoModifyThreatPercent(unit, -100); if (TargetThreat) - me->AddThreat(pUnit, TargetThreat); + me->AddThreat(unit, TargetThreat); } } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 308a6de4f0c..d602b4d2aac 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -545,7 +545,7 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* ) {} + void MoveInLineOfSight(Unit*) {} void JustDied(Unit* /*killer*/) { @@ -635,7 +635,7 @@ public: void EnterPhase(PhaseIllidan NextPhase) { DoZoneInCombat(); - switch(NextPhase) + switch (NextPhase) { case PHASE_NORMAL: case PHASE_NORMAL_2: @@ -790,7 +790,7 @@ public: void HandleFlightSequence() { - switch(FlightCount) + switch (FlightCount) { case 1://lift off me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); @@ -915,7 +915,7 @@ public: SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - switch(TransformCount) + switch (TransformCount) { case 2: DoResetThreat(); @@ -959,7 +959,7 @@ public: } } - switch(Phase) + switch (Phase) { case PHASE_NORMAL: if (HealthBelowPct(65)) @@ -999,7 +999,7 @@ public: if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || (Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED))) { - switch(Event) + switch (Event) { //PHASE_NORMAL case EVENT_BERSERK: @@ -1073,7 +1073,7 @@ public: if (Phase == PHASE_FLIGHT) { - switch(Event) + switch (Event) { case EVENT_FIREBALL: DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL); @@ -1106,7 +1106,7 @@ public: if (Phase == PHASE_DEMON) { - switch(Event) + switch (Event) { case EVENT_SHADOW_BLAST: me->GetMotionMaster()->Clear(false); @@ -1219,7 +1219,7 @@ public: void EnterPhase(PhaseIllidan NextPhase)//This is in fact Illidan's phase. { - switch(NextPhase) + switch (NextPhase) { case PHASE_TALK_SEQUENCE: if (Timer[EVENT_MAIEV_STEALTH]) @@ -1298,7 +1298,7 @@ public: else Timer[i] -= diff; } - switch(Event) + switch (Event) { case EVENT_MAIEV_STEALTH: { @@ -1474,9 +1474,9 @@ public: std::vector<Unit*> eliteList; for (std::list<HostileReference*>::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->GetEntry() == ILLIDARI_ELITE) - eliteList.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->GetEntry() == ILLIDARI_ELITE) + eliteList.push_back(unit); } for (std::vector<Unit*>::const_iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr) (*itr)->setDeathState(JUST_DIED); @@ -1541,7 +1541,7 @@ public: { if (!pInstance) return; - switch(NextPhase) + switch (NextPhase) { case PHASE_CHANNEL: BeginChannel(); @@ -1603,7 +1603,7 @@ public: void HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: if (GETCRE(Illidan, IllidanGUID)) @@ -1638,7 +1638,7 @@ public: return; } - switch(ChannelCount) + switch (ChannelCount) { case 0: // channel failed me->InterruptNonMeleeSpells(true); @@ -1686,7 +1686,7 @@ public: void HandleWalkSequence() { - switch(WalkCount) + switch (WalkCount) { case 6: for (uint8 i = 0; i < 2; ++i) @@ -1734,7 +1734,7 @@ public: if (Event) { - switch(Phase) + switch (Phase) { case PHASE_CHANNEL: if (JustCreated) @@ -1872,7 +1872,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* summon) { Summons.Summon(summon); - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case PARASITIC_SHADOWFIEND: { @@ -1918,7 +1918,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() { - switch(TalkCount) + switch (TalkCount) { case 0: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 9311e1e6744..62e33f0913b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -165,12 +165,12 @@ public: float Z = TeleportPoint[random].z; for (uint8 i = 0; i < 3; ++i) { - Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 1); - if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1); + if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) { - TargetGUID[i] = pUnit->GetGUID(); - pUnit->CastSpell(pUnit, SPELL_TELEPORT_VISUAL, true); - DoTeleportPlayer(pUnit, X, Y, Z, pUnit->GetOrientation()); + TargetGUID[i] = unit->GetGUID(); + unit->CastSpell(unit, SPELL_TELEPORT_VISUAL, true); + DoTeleportPlayer(unit, X, Y, Z, unit->GetOrientation()); } } } @@ -196,7 +196,7 @@ public: BeamTimer = 9000; - switch(CurrentBeam) + switch (CurrentBeam) { case 0: DoCast(target, SPELL_BEAM_SINISTER); @@ -247,12 +247,12 @@ public: { for (uint8 i = 0; i < 3; ++i) { - Unit* pUnit = NULL; + Unit* unit = NULL; if (TargetGUID[i]) { - pUnit = Unit::GetUnit((*me), TargetGUID[i]); - if (pUnit) - pUnit->CastSpell(pUnit, SPELL_ATTRACTION, true); + unit = Unit::GetUnit((*me), TargetGUID[i]); + if (unit) + unit->CastSpell(unit, SPELL_ATTRACTION, true); TargetGUID[i] = 0; } } diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 813deacf7a2..c3bb4ee3d2b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -216,12 +216,12 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit) + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit) { - DoModifyThreatPercent(pUnit, -100); - float threat = target->getThreatManager().getThreat(pUnit); - me->AddThreat(pUnit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). + DoModifyThreatPercent(unit, -100); + float threat = target->getThreatManager().getThreat(unit); + me->AddThreat(unit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). } } } @@ -256,7 +256,7 @@ public: if (Timer <= diff) { - switch(Counter) + switch (Counter) { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); // I R ANNNGRRRY! @@ -438,9 +438,9 @@ public: std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) // Only alive players - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) // Only alive players + targets.push_back(unit); } if (targets.empty()) return; // No targets added for some reason. No point continuing. diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 852f69597b9..cced0207ca1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -673,7 +673,7 @@ public: if (type != POINT_MOTION_TYPE) return; - switch(id) + switch (id) { case 0: ++WayPointId; break; @@ -803,7 +803,7 @@ public: { if (SoulRetrieveTimer <= diff) { - switch(EndingTalkCount) + switch (EndingTalkCount) { case 0: me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); @@ -821,14 +821,14 @@ public: { bool Yelled = false; for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature(*me, *itr)) + if (Creature* unit = Unit::GetCreature(*me, *itr)) { if (!Yelled) { - DoScriptText(SAY_BROKEN_FREE_01, pUnit); + DoScriptText(SAY_BROKEN_FREE_01, unit); Yelled = true; } - pUnit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); + unit->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); } } ++EndingTalkCount; @@ -838,9 +838,9 @@ public: if (!BrokenList.empty()) { for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature(*me, *itr)) + if (Creature* unit = Unit::GetCreature(*me, *itr)) // This is the incorrect spell, but can't seem to find the right one. - pUnit->CastSpell(pUnit, 39656, true); + unit->CastSpell(unit, 39656, true); } ++EndingTalkCount; SoulRetrieveTimer = 5000; @@ -849,8 +849,8 @@ public: if (!BrokenList.empty()) { for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) - if (Creature* pUnit = Unit::GetCreature((*me), *itr)) - pUnit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); + if (Creature* unit = Unit::GetCreature((*me), *itr)) + unit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); } SoulRetrieveTimer = 0; break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index ce4d7745a68..6785f7e4e9e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -177,13 +177,13 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && me->IsWithinMeleeRange(pUnit)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && me->IsWithinMeleeRange(unit)) { - if (pUnit->GetHealth() > health) + if (unit->GetHealth() > health) { - health = pUnit->GetHealth(); - target = pUnit; + health = unit->GetHealth(); + target = unit; } } } @@ -200,7 +200,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 0d3301ec29b..53e5fae888e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -173,9 +173,9 @@ public: std::list<Unit*> targets; for (; itr != m_threatlist.end(); ++itr) { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) - targets.push_back(pUnit); + Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (unit && unit->isAlive()) + targets.push_back(unit); } targets.sort(Trinity::ObjectDistanceOrderPred(me)); Unit* target = targets.front(); @@ -322,11 +322,11 @@ public: std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && unit->isAlive()) { - float threat = DoGetThreat(pUnit); - Blossom->AddThreat(pUnit, threat); + float threat = DoGetThreat(unit); + Blossom->AddThreat(unit, threat); } } } @@ -389,9 +389,9 @@ public: Done = true; if (AggroTargetGUID) { - Unit* pUnit = Unit::GetUnit((*me), AggroTargetGUID); - if (pUnit) - AttackStart(pUnit); + Unit* unit = Unit::GetUnit((*me), AggroTargetGUID); + if (unit) + AttackStart(unit); DoZoneInCombat(); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 080d26b7c49..c017b943954 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -154,7 +154,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHIELD: DoCast(me, SPELL_TIDAL_SHIELD, true); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 7d698559197..71ee7d06f32 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -419,10 +419,10 @@ struct boss_illidari_councilAI : public ScriptedAI { for (uint8 i = 0; i < 4; ++i) { - if (Unit* pUnit = Unit::GetUnit(*me, Council[i])) - if (pUnit != me && pUnit->getVictim()) + if (Unit* unit = Unit::GetUnit(*me, Council[i])) + if (unit != me && unit->getVictim()) { - AttackStart(pUnit->getVictim()); + AttackStart(unit->getVictim()); return; } } @@ -437,11 +437,11 @@ struct boss_illidari_councilAI : public ScriptedAI damage /= 4; for (uint8 i = 0; i < 4; ++i) { - if (Creature* pUnit = Unit::GetCreature(*me, Council[i])) - if (pUnit != me && damage < pUnit->GetHealth()) + if (Creature* unit = Unit::GetCreature(*me, Council[i])) + if (unit != me && damage < unit->GetHealth()) { - pUnit->ModifyHealth(-int32(damage)); - pUnit->LowerPlayerDamageReq(damage); + unit->ModifyHealth(-int32(damage)); + unit->LowerPlayerDamageReq(damage); } } } @@ -504,15 +504,15 @@ public: Unit* SelectCouncilMember() { - Unit* pUnit = me; + Unit* unit = me; uint32 member = 0; // He chooses Lady Malande most often if (rand()%10 == 0) // But there is a chance he picks someone else. member = urand(1, 3); if (member != 2) // No need to create another pointer to us using Unit::GetUnit - pUnit = Unit::GetUnit((*me), Council[member]); - return pUnit; + unit = Unit::GetUnit((*me), Council[member]); + return unit; } void CastAuraOnCouncil() @@ -525,9 +525,9 @@ public: } for (uint8 i = 0; i < 4; ++i) { - Unit* pUnit = Unit::GetUnit((*me), Council[i]); - if (pUnit) - pUnit->CastSpell(pUnit, spellid, true, 0, 0, me->GetGUID()); + Unit* unit = Unit::GetUnit((*me), Council[i]); + if (unit) + unit->CastSpell(unit, spellid, true, 0, 0, me->GetGUID()); } } @@ -538,12 +538,12 @@ public: if (BlessingTimer <= diff) { - if (Unit* pUnit = SelectCouncilMember()) + if (Unit* unit = SelectCouncilMember()) { switch (urand(0, 1)) { - case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD); break; - case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break; + case 0: DoCast(unit, SPELL_BLESS_SPELLWARD); break; + case 1: DoCast(unit, SPELL_BLESS_PROTECTION); break; } } BlessingTimer = 60000; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 4feca05c111..d578b62c24b 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -142,7 +142,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 22887: Najentus = creature->GetGUID(); break; case 23089: Akama = creature->GetGUID(); break; @@ -161,7 +161,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; @@ -190,7 +190,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_HIGHWARLORDNAJENTUS: return Najentus; case DATA_AKAMA: return Akama; @@ -216,7 +216,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: if (data == DONE) @@ -298,7 +298,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_HIGHWARLORDNAJENTUSEVENT: return m_auiEncounter[0]; case DATA_SUPREMUSEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 1433859dfe1..141e5d1c277 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -707,15 +707,15 @@ public: if (Heal_Timer <= diff) { // It can be cast on any of the mobs - Unit* pUnit = NULL; + Unit* unit = NULL; - while (pUnit == NULL || !pUnit->isAlive()) + while (unit == NULL || !unit->isAlive()) { - pUnit = selectAdvisorUnit(); + unit = selectAdvisorUnit(); } - if (pUnit && pUnit->isAlive()) - DoCast(pUnit, SPELL_HEAL); + if (unit && unit->isAlive()) + DoCast(unit, SPELL_HEAL); Heal_Timer = 60000; } else Heal_Timer -= diff; @@ -724,26 +724,26 @@ public: Unit* selectAdvisorUnit() { - Unit* pUnit = NULL; + Unit* unit = NULL; if (pInstance) { - switch(rand()%4) + switch (rand()%4) { case 0: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); + unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); break; case 1: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); + unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); break; case 2: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); + unit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); break; case 3: - pUnit = me; + unit = me; break; } - } else pUnit = me; - return pUnit; + } else unit = me; + return unit; } }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 0f27d5e7a9d..2820a2fdef2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -307,7 +307,7 @@ public: { uint32 mark_spell = 0; - switch(MarkOfHydross_Count) + switch (MarkOfHydross_Count) { case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 817c38fef2e..19fdc454de3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -884,7 +884,7 @@ public: }; //Coilfang Strider -//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. +//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds, for 5 seconds and increasing their movement speed by 150% during the fear. class mob_coilfang_strider : public CreatureScript { public: @@ -992,7 +992,7 @@ public: { uint32 identifier; uint8 channel_identifier; - switch(gObj->GetEntry()) + switch (gObj->GetEntry()) { case 185052: identifier = DATA_SHIELDGENERATOR1; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index f3da63af38b..e1b3ab1308f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -96,9 +96,9 @@ public: } void JustDied(Unit* /*victim*/) { - Unit* pUnit = Unit::GetUnit((*me), victimGUID); - if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) - pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); + Unit* unit = Unit::GetUnit((*me), victimGUID); + if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER)) + unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } void DamageTaken(Unit* done_by, uint32 &damage) @@ -353,13 +353,13 @@ public: { if (InnderDemon[i] > 0) { - Creature* pUnit = Unit::GetCreature((*me), InnderDemon[i]); - if (pUnit && pUnit->isAlive()) + Creature* unit = Unit::GetCreature((*me), InnderDemon[i]); + if (unit && unit->isAlive()) { - Unit* unit_target = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demon::mob_inner_demonAI, pUnit->AI())->victimGUID); + Unit* unit_target = Unit::GetUnit(*unit, CAST_AI(mob_inner_demon::mob_inner_demonAI, unit->AI())->victimGUID); if (unit_target && unit_target->isAlive()) { - pUnit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); + unit->CastSpell(unit_target, SPELL_CONSUMING_MADNESS, true); DoModifyThreatPercent(unit_target, -100); } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index a30b46c2346..da36f70a339 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -157,7 +157,7 @@ public: void ApplyWateryGrave(Unit* player, uint8 i) { - switch(i) + switch (i) { case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break; case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 88496899bb1..32468cca606 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -108,7 +108,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17797: ThespiaGUID = creature->GetGUID(); break; case 17796: MekgineerGUID = creature->GetGUID(); break; @@ -118,7 +118,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case MAIN_CHAMBERS_DOOR: MainChambersDoor = go->GetGUID(); break; case ACCESS_PANEL_HYDRO: AccessPanelHydro = go->GetGUID(); break; @@ -128,7 +128,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: if (data == SPECIAL) @@ -168,7 +168,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HYDROMANCER_THESPIA: return m_auiEncounter[0]; @@ -184,7 +184,7 @@ public: uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THESPIA: return ThespiaGUID; diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 79b6be51d5c..b0dbdcb94da 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -84,7 +84,7 @@ public: void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 18835: KigglerTheCrazed = creature->GetGUID(); break; case 18836: BlindeyeTheSeer = creature->GetGUID(); break; @@ -96,7 +96,7 @@ public: void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 184468: MaulgarDoor = go->GetGUID(); @@ -117,7 +117,7 @@ public: uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_MAULGAREVENT_TANK: return MaulgarEvent_Tank; case DATA_KIGGLERTHECRAZED: return KigglerTheCrazed; @@ -133,7 +133,7 @@ public: void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: if (data == DONE) HandleGameObject(MaulgarDoor, true); @@ -150,7 +150,7 @@ public: uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_MAULGAREVENT: return m_auiEncounter[0]; case DATA_GRUULEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 8c15bbace2d..3a10da0f454 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -92,7 +92,7 @@ class instance_blood_furnace : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17381: The_MakerGUID = creature->GetGUID(); @@ -141,7 +141,7 @@ class instance_blood_furnace : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_THE_MAKER: return The_MakerGUID; case DATA_BROGGOK: return BroggokGUID; @@ -167,7 +167,7 @@ class instance_blood_furnace : public InstanceMapScript void SetData(uint32 /*type*/, uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: m_auiEncounter[0] = data; break; case TYPE_BROGGOK_EVENT: m_auiEncounter[1] = data; break; @@ -190,7 +190,7 @@ class instance_blood_furnace : public InstanceMapScript uint32 GetData(uint32 data) { - switch(data) + switch (data) { case TYPE_THE_MAKER_EVENT: return m_auiEncounter[0]; case TYPE_BROGGOK_EVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 6661bf2ee15..1fd1094494d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -397,7 +397,7 @@ class boss_vazruden_the_herald : public CreatureScript void UpdateAI(const uint32 diff) { - switch(phase) + switch (phase) { case 0: // circle around the platform return; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index ba6969acc2c..1436c664e9f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 185168: m_uiChestNGUID = go->GetGUID(); @@ -68,7 +68,7 @@ class instance_ramparts : public InstanceMapScript { sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData); - switch(uiType) + switch (uiType) { case TYPE_VAZRUDEN: if (uiData == DONE && m_auiEncounter[1] == DONE && !spawned) diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 0c346f68422..cd463376ee9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -86,7 +86,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17257: MagtheridonGUID = creature->GetGUID(); @@ -99,7 +99,7 @@ class instance_magtheridons_lair : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case 181713: go->SetUInt32Value(GAMEOBJECT_FLAGS, 0); @@ -121,7 +121,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint64 GetData64(uint32 type) { - switch(type) + switch (type) { case DATA_MAGTHERIDON: return MagtheridonGUID; @@ -131,7 +131,7 @@ class instance_magtheridons_lair : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_MAGTHERIDON_EVENT: m_auiEncounter[0] = data; @@ -141,7 +141,7 @@ class instance_magtheridons_lair : public InstanceMapScript HandleGameObject(DoorGUID, true); break; case DATA_CHANNELER_EVENT: - switch(data) + switch (data) { case NOT_STARTED: // Reset all channelers once one is reset. if (m_auiEncounter[1] != NOT_STARTED) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 5d7d7883ce0..f4f6a6fb221 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -281,7 +281,7 @@ class boss_warbringer_omrogg : public CreatureScript Unit* source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); - switch(ikilling) + switch (ikilling) { case 0: DoScriptText(Killing[ikilling].id, source); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 5b91bb8e9e6..4f837870612 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -115,7 +115,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript void JustSummoned(Creature* summoned) { - switch(summoned->GetEntry()) + switch (summoned->GetEntry()) { case MOB_HEARTHEN_GUARD: case MOB_SHARPSHOOTER_GUARD: diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 3fb98f8b17e..b70ad851536 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -55,7 +55,7 @@ class instance_shattered_halls : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case DOOR_NETHEKURSE: nethekurseDoorGUID = go->GetGUID(); @@ -65,7 +65,7 @@ class instance_shattered_halls : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 16807: nethekurseGUID = creature->GetGUID(); @@ -75,7 +75,7 @@ class instance_shattered_halls : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: m_auiEncounter[0] = data; @@ -88,7 +88,7 @@ class instance_shattered_halls : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_NETHEKURSE: return m_auiEncounter[0]; @@ -100,7 +100,7 @@ class instance_shattered_halls : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_NETHEKURSE: return nethekurseGUID; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 37404b348db..9ca982a940c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -246,7 +246,7 @@ class boss_alar : public CreatureScript AfterMoving = false; } - switch(WaitEvent) + switch (WaitEvent) { case WE_PLATFORM: Platforms_Move_Timer = 30000+rand()%5000; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 7b7c8c5e478..51c336af375 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -129,7 +129,6 @@ class boss_high_astromancer_solarian : public CreatureScript AppearDelay = false; Wrath_Timer = 20000+rand()%5000;//twice in phase one Phase = 1; - Wrath_Timer = 20000+rand()%5000;//twice in phase one if (pInstance) pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 592c2a1190d..12da67f94b5 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -477,7 +477,7 @@ class boss_kaelthas : public CreatureScript Creature* Advisor = NULL; //Subphase switch - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 - Start case 0: @@ -770,8 +770,8 @@ class boss_kaelthas : public CreatureScript if (FlameStrike_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_FLAME_STRIKE); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_FLAME_STRIKE); FlameStrike_Timer = 30000; } @@ -784,7 +784,7 @@ class boss_kaelthas : public CreatureScript for (uint32 i = 0; i < 3; ++i) { sLog->outDebug(LOG_FILTER_TSCR, "SD2: Kael'Thas mind control not supported."); - //DoCast(pUnit, SPELL_MIND_CONTROL); + //DoCast(unit, SPELL_MIND_CONTROL); } MindControl_Timer = 60000; @@ -892,11 +892,11 @@ class boss_kaelthas : public CreatureScript // 1) Kael'thas will portal the whole raid right into his body for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) { //Use work around packet to prevent player from being dropped from combat - DoTeleportPlayer(pUnit, afGravityPos[0], afGravityPos[1], afGravityPos[2], pUnit->GetOrientation()); + DoTeleportPlayer(unit, afGravityPos[0], afGravityPos[1], afGravityPos[2], unit->GetOrientation()); } } @@ -913,20 +913,20 @@ class boss_kaelthas : public CreatureScript // 2) At that point he will put a Gravity Lapse debuff on everyone for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid())) { - DoCast(pUnit, SPELL_KNOCKBACK, true); + DoCast(unit, SPELL_KNOCKBACK, true); //Gravity lapse - needs an exception in Spell system to work - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); + unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); //Using packet workaround WorldPacket data(12); data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } GravityLapse_Timer = 10000; @@ -946,14 +946,14 @@ class boss_kaelthas : public CreatureScript //Remove flight for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid())) { //Using packet workaround WorldPacket data(12); data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); - data.append(pUnit->GetPackGUID()); + data.append(unit->GetPackGUID()); data << uint32(0); - pUnit->SendMessageToSet(&data, true); + unit->SendMessageToSet(&data, true); } } @@ -982,8 +982,8 @@ class boss_kaelthas : public CreatureScript //NetherBeam_Timer if (NetherBeam_Timer <= diff) { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_NETHER_BEAM); + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_NETHER_BEAM); NetherBeam_Timer = 4000; } @@ -1286,12 +1286,12 @@ class boss_grand_astromancer_capernian : public CreatureScript std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()); //if in melee range - if (pUnit && pUnit->IsWithinDistInMap(me, 5)) + if (unit && unit->IsWithinDistInMap(me, 5)) { InMeleeRange = true; - target = pUnit; + target = unit; break; } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 8af59582a18..2ac4f49d995 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript void OnCreatureCreate(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 20064: ThaladredTheDarkener = creature->GetGUID(); @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript uint64 GetData64(uint32 identifier) { - switch(identifier) + switch (identifier) { case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; case DATA_LORDSANGUINAR: return LordSanguinar; @@ -128,7 +128,7 @@ class instance_the_eye : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_ALAREVENT: AlarEventPhase = data; @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_ALAREVENT: return AlarEventPhase; case DATA_HIGHASTROMANCERSOLARIANEVENT: return m_auiEncounter[1]; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index e2a12c350b6..883585c0c2a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -58,7 +58,7 @@ class instance_mechanar : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: return m_auiEncounter[0]; } @@ -73,7 +73,7 @@ class instance_mechanar : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case DATA_NETHERMANCER_EVENT: m_auiEncounter[0] = data; break; } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index adf71c8a25b..eeb2f069ed7 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -146,7 +146,7 @@ class npc_millhouse_manastorm : public CreatureScript { if (Phase < 8) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(SAY_INTRO_1, me); @@ -371,7 +371,7 @@ class npc_warden_mellichar : public CreatureScript me->InterruptNonMeleeSpells(true); me->RemoveAurasByType(SPELL_AURA_DUMMY); - switch(Phase) + switch (Phase) { case 2: DoCast(me, SPELL_TARGET_ALPHA); @@ -420,7 +420,7 @@ class npc_warden_mellichar : public CreatureScript if (Phase != 7) DoCast(me, SPELL_TARGET_OMEGA); - switch(Phase) + switch (Phase) { case 2: switch (urand(0, 1)) @@ -471,7 +471,7 @@ class npc_warden_mellichar : public CreatureScript } if (CanProgress()) { - switch(Phase) + switch (Phase) { case 1: DoScriptText(YELL_INTRO2, me); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index f3310035f8d..cf81f7fb1ba 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -163,7 +163,7 @@ class boss_harbinger_skyriss : public CreatureScript if (Intro_Timer <= diff) { - switch(Intro_Phase) + switch (Intro_Phase) { case 1: DoScriptText(SAY_INTRO, me); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index eef84ad093e..25956fde3d2 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -100,7 +100,7 @@ class instance_arcatraz : public InstanceMapScript void OnGameObjectCreate(GameObject* go) { - switch(go->GetEntry()) + switch (go->GetEntry()) { case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_AlphaGUID = go->GetGUID(); break; case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_BetaGUID = go->GetGUID(); break; @@ -122,7 +122,7 @@ class instance_arcatraz : public InstanceMapScript void SetData(uint32 type, uint32 data) { - switch(type) + switch (type) { case TYPE_ZEREKETH: m_auiEncounter[0] = data; @@ -204,7 +204,7 @@ class instance_arcatraz : public InstanceMapScript uint32 GetData(uint32 type) { - switch(type) + switch (type) { case TYPE_HARBINGERSKYRISS: return m_auiEncounter[3]; case TYPE_WARDEN_1: return m_auiEncounter[4]; @@ -218,7 +218,7 @@ class instance_arcatraz : public InstanceMapScript uint64 GetData64(uint32 data) { - switch(data) + switch (data) { case DATA_MELLICHAR: return MellicharGUID; case DATA_SPHERE_SHIELD: return GoSphereGUID; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index e130512f08c..64fea1c41e5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -93,7 +93,7 @@ class boss_high_botanist_freywinn : public CreatureScript void DoSummonSeedling() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_PLANT_WHITE); break; case 1: DoCast(me, SPELL_PLANT_GREEN); break; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 872421f7561..43078c48537 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -86,7 +86,7 @@ class boss_laj : public CreatureScript void DoTransform() { - switch(rand()%5) + switch (rand()%5) { case 0: me->SetDisplayId(MODEL_DEFAULT); @@ -133,7 +133,7 @@ class boss_laj : public CreatureScript void DoSummons() { - switch(rand()%4) + switch (rand()%4) { case 0: DoCast(me, SPELL_SUMMON_LASHER_1, true); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 1acc75981e0..2bf4abbcb96 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -101,7 +101,7 @@ class mob_warp_splinter_treant : public CreatureScript if (me->IsWithinMeleeRange(Warp, 2.5f)) { int32 CurrentHP_Treant = (int32)me->GetHealth(); - Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID()); + Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0, 0, me->GetGUID()); me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; } diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 8ea12b48a07..b73d2f81fb6 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -194,7 +194,7 @@ public: { if (NihilSpeech_Timer <= diff) { - switch(NihilSpeech_Phase) + switch (NihilSpeech_Phase) { case 0: DoScriptText(SAY_NIHIL_1, me); @@ -389,7 +389,7 @@ public: { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { - switch(pGo->GetEntry()) + switch (pGo->GetEntry()) { case LEGION_OBELISK_ONE: obelisk_one = true; @@ -452,7 +452,7 @@ public: { npc_bloodmaul_brutebaneAI(Creature* creature) : ScriptedAI(creature) { - if(Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) + if (Creature* Ogre = me->FindNearestCreature(NPC_OGRE_BRUTE, 50, true)) { Ogre->SetReactState(REACT_DEFENSIVE); Ogre->GetMotionMaster()->MovePoint(1, me->GetPositionX()-1, me->GetPositionY()+1, me->GetPositionZ()); @@ -503,7 +503,8 @@ public: if (me->IsWithinDistInMap(who, 50.0f)) { if (who->GetTypeId() == TYPEID_PLAYER) - if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED || QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) + if (who->ToPlayer()->GetQuestStatus(QUEST_GETTING_THE_BLADESPIRE_TANKED) == QUEST_STATUS_INCOMPLETE + || who->ToPlayer()->GetQuestStatus(QUEST_BLADESPIRE_KEGGER) == QUEST_STATUS_INCOMPLETE) PlayerGUID = who->GetGUID(); } } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index defc3cf90f6..2f725e78666 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -113,9 +113,9 @@ class boss_doomlord_kazzak : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SHADOW_VOLLEY: DoCastVictim(SPELL_SHADOWVOLLEY); diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 8143ac528b5..5cb84eb1303 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -106,9 +106,9 @@ class boss_doomwalker : public CreatureScript if (me->HasUnitState(UNIT_STAT_CASTING)) return; - while(uint32 eventId = _events.ExecuteEvent()) + while (uint32 eventId = _events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_ENRAGE: if (!HealthAbovePct(20)) diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 430754c10d6..699a1ef49bc 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -183,7 +183,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 0: DoScriptText(EMOTE_WOLF_LIFT_HEAD, me); @@ -277,7 +277,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TRACY_PROUDWELL_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -334,7 +334,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TROLLBANE_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index ad30ab32e92..3a060cf107f 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -613,7 +613,7 @@ public: void WaypointReached(uint32 uiPointId) { - switch(uiPointId) + switch (uiPointId) { case 7: DoScriptText(SAY_MAG_MORE, me); diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index 5843787b1be..2ae0cce2ba2 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -117,7 +117,7 @@ public: Unit* p = Unit::GetUnit((*me), someplayer); if (p && p->GetTypeId() == TYPEID_PLAYER) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: CAST_PLR(p)->FailQuest(10299); @@ -148,7 +148,7 @@ public: void DoWaveSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) @@ -202,7 +202,7 @@ public: } void DoFinalSpawnForCreature(Creature* creature) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); @@ -237,7 +237,7 @@ public: { if (Event_Timer <= diff) { - switch(Phase) + switch (Phase) { case 1: if (someplayer) @@ -317,7 +317,7 @@ public: Creature* manaforge = NULL; - switch(pGo->GetAreaId()) + switch (pGo->GetAreaId()) { case 3726: //b'naar if ((player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && @@ -565,7 +565,7 @@ public: break; //Phase 6 case 6: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1: Turn Dawnforge and Ardonis case 0: @@ -584,7 +584,7 @@ public: break; //Phase 7 Pathaleons say 3 Sentence, every sentence need a subphase case 7: - switch(PhaseSubphase) + switch (PhaseSubphase) { //Subphase 1 case 0: @@ -640,7 +640,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -782,7 +782,7 @@ public: PlayerGUID = who->GetGUID(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) { DoCast(me, SPELL_DE_MATERIALIZE); } @@ -809,10 +809,10 @@ public: for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) { - if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) + if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetCreateMana() > 0) - UnitsWithMana.push_back(pUnit); + if (unit->GetCreateMana() > 0) + UnitsWithMana.push_back(unit); } } if (!UnitsWithMana.empty()) @@ -903,7 +903,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: //first spawn me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 1666cfa78e2..327964e7b1e 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -129,9 +129,9 @@ public: { if (bCanEat && !bIsEating) { - if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) + if (Unit* unit = Unit::GetUnit(*me, uiPlayerGUID)) { - if (GameObject* pGo = pUnit->FindNearestGameObject(GO_CARCASS, 10)) + if (GameObject* pGo = unit->FindNearestGameObject(GO_CARCASS, 10)) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); @@ -771,7 +771,7 @@ public: return 0; } - switch(Step) + switch (Step) { case 0: return 0; break; case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break; @@ -950,7 +950,7 @@ public: if (!player) return; - switch(uiPointId) + switch (uiPointId) { case 13: DoScriptText(SAY_WIL_PROGRESS1, me, player); @@ -1215,7 +1215,7 @@ public: AnimationTimer = TorlothAnim[AnimationCount].Timer; - switch(AnimationCount) + switch (AnimationCount) { case 0: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); @@ -1295,7 +1295,7 @@ public: void JustDied(Unit* slayer) { if (slayer) - switch(slayer->GetTypeId()) + switch (slayer->GetTypeId()) { case TYPEID_UNIT: if (Unit* owner = slayer->GetOwner()) @@ -1749,7 +1749,7 @@ public: uint32 entry = 0; uint32 credit = 0; - switch(me->GetEntry()) { + switch (me->GetEntry()) { case ENTRY_ENRAGED_FIRE_SPIRIT: entry = ENTRY_FIERY_SOUL; //credit = SPELL_FIERY_SOUL_CAPTURED_CREDIT; diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 35ef9ae820b..f2aa9fe5786 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -330,7 +330,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: DoScriptText(SAY1, me, player); break; case 4: DoScriptText(WHISP1, me, player); break; @@ -449,7 +449,7 @@ public: { Player* player = Unit::GetPlayer(*me, PlayerGUID); - switch(Step) + switch (Step) { case 0:{ me->SetInFront(player); Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20); @@ -632,7 +632,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 785f476b9ab..2dec7ab191d 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -95,9 +95,9 @@ public: if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(30, damage)) { - if (Group* pGroup = CAST_PLR(done_by)->GetGroup()) + if (Group* group = CAST_PLR(done_by)->GetGroup()) { - for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next()) + for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) { Player* pGroupie = itr->getSource(); if (pGroupie && @@ -210,7 +210,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 8: player->AreaExploredOrEventHappens(10898); @@ -474,7 +474,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 0: { @@ -551,7 +551,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGo, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, pGo, uiAction); break; } @@ -574,7 +574,7 @@ public: void SendActionMenu(Player* player, GameObject* /*pGo*/, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: player->CastSpell(player, 40642, false); @@ -676,7 +676,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 3: me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 62d0893f014..ddffcb53e61 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -328,7 +328,7 @@ public: if (!player) return; - switch(i) + switch (i) { case 4: DoScriptText(SAY_AMBUSH1, me, player); @@ -407,7 +407,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_TIMOTHY_DANIELS1, creature->GetGUID()); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index b30841e19cc..86b92eebfe3 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -65,7 +65,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct); } @@ -112,7 +112,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct)); } @@ -168,13 +168,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader SpellInfo const* talentSpell = sSpellMgr->GetSpellInfo(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = talentSpell->Effects[EFFECT_0].CalcValue(GetCaster()); Unit* caster = GetCaster(); - if(!caster) + if (!caster) return; - if(Player* player = caster->ToPlayer()) + if (Player* player = caster->ToPlayer()) amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK)); } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct); } @@ -429,7 +429,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // You have a chance equal to your Parry chance if ((dmgInfo.GetDamageType() == SPELL_DIRECT_DAMAGE) && roll_chance_f(GetTarget()->GetUnitParryChance())) @@ -532,7 +532,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // min pct of hp is stored in effect 0 of talent spell uint32 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id); @@ -607,7 +607,7 @@ public: } }; -// 50391,50392 Improved Unholy Presence +// 50391, 50392 Improved Unholy Presence class spell_dk_improved_unholy_presence : public SpellScriptLoader { public: @@ -632,7 +632,7 @@ public: { // Not listed as any effect, only base points set in dbc int32 basePoints0 = aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0 , &basePoints0, &basePoints0, true, 0, aurEff); + target->CastCustomSpell(target, DK_SPELL_IMPROVED_UNHOLY_PRESENCE_TRIGGERED, &basePoints0, &basePoints0, &basePoints0, true, 0, aurEff); } } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 6a8a942f7ae..17849027dd4 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -108,7 +108,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while Stunned in Moonkin Form if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)) @@ -152,7 +152,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while Stunned in Cat Form if (GetTarget()->GetShapeshiftForm() == FORM_CAT && GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN)) @@ -295,6 +295,38 @@ class spell_dru_starfall_aoe : public SpellScriptLoader } }; +// 40121 - Swift Flight Form (Passive) +class spell_dru_swift_flight_passive : public SpellScriptLoader +{ + public: + spell_dru_swift_flight_passive() : SpellScriptLoader("spell_dru_swift_flight_passive") { } + + class spell_dru_swift_flight_passive_AuraScript : public AuraScript + { + PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript); + + void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) + { + Unit* caster = GetCaster(); + if (!caster || !caster->ToPlayer()) + return; + + if (caster->ToPlayer()->Has310Flyer(false)) + amount = 310; + } + + void Register() + { + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_dru_swift_flight_passive_AuraScript(); + } +}; + void AddSC_druid_spell_scripts() { new spell_dru_glyph_of_starfire(); @@ -303,4 +335,5 @@ void AddSC_druid_spell_scripts() new spell_dru_savage_defense(); new spell_dru_t10_restoration_4p_bonus(); new spell_dru_starfall_aoe(); + new spell_dru_swift_flight_passive(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f90fe53a9e2..f0b48a5ad90 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -102,7 +102,7 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader bool CheckAreaTarget(Unit* target) { - switch(target->GetEntry()) + switch (target->GetEntry()) { // alliance case 14762: // Dun Baldar North Marshal @@ -1226,7 +1226,7 @@ class spell_gen_launch : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) - player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE,player); // prevents falling damage + player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE, player); // prevents falling damage } void Launch() @@ -1241,10 +1241,10 @@ class spell_gen_launch : public SpellScriptLoader // There is no spell for this, the following calculation was based on void Spell::CalculateJumpSpeeds float speedZ = 10.0f; - float dist = position->GetExactDist2d(player->GetPositionX(),player->GetPositionY()); + float dist = position->GetExactDist2d(player->GetPositionX(), player->GetPositionY()); float speedXY = dist; - player->GetMotionMaster()->MoveJump(position->GetPositionX(),position->GetPositionY(),position->GetPositionZ(),speedXY,speedZ); + player->GetMotionMaster()->MoveJump(position->GetPositionX(), position->GetPositionY(), position->GetPositionZ(), speedXY, speedZ); } } @@ -1324,8 +1324,8 @@ public: PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript) void HandleDummy(SpellEffIndex effIndex) - { - + { + if (Player* player = GetCaster()->ToPlayer()) { @@ -1344,7 +1344,7 @@ public: // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - + } void Register() diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index baa998f9487..2346a30640c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1108,7 +1108,7 @@ class spell_magic_eater_food : public SpellScriptLoader target->CastSpell(target, SPELL_WELL_FED_3, true); break; case 4: - target->CastSpell(target, SPELL_WELL_FED_4, true); + target->CastSpell(target, SPELL_WELL_FED_4, true); break; case 5: target->CastSpell(target, SPELL_WELL_FED_5, true); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index f07a13bf7db..84df4418078 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -141,7 +141,7 @@ public: if (Unit* unitTarget = GetHitUnit()) { uint32 spell_id = 0; - switch(unitTarget->getClass()) + switch (unitTarget->getClass()) { case CLASS_DRUID: spell_id = SPELL_BLESSING_OF_LOWER_CITY_DRUID; break; case CLASS_PALADIN: spell_id = SPELL_BLESSING_OF_LOWER_CITY_PALADIN; break; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 3bcbc322e06..07b8a79691a 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -64,7 +64,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) @@ -131,7 +131,7 @@ class spell_pri_mind_sear : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); + unitList.remove_if (Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } void Register() diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 6fbd33fe81b..6ae9577070e 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -648,7 +648,7 @@ public: Unit* target = GetTarget(); if (Player* player = caster->GetCharmerOrOwnerPlayerOrPlayerItself()) { - switch(target->GetEntry()) + switch (target->GetEntry()) { case NPC_FROSTWORG: target->CastSpell(player, SPELL_FROSTWORG_CREDIT, true); @@ -707,7 +707,7 @@ public: Unit* pCaster = GetCaster(); if (Player* player = pCaster->ToPlayer()) { - if(Creature* target = GetHitCreature()) + if (Creature* target = GetHitCreature()) { player->CastSpell(player, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, NULL); player->KilledMonsterCredit(NPC_FALLEN_EARTHEN_DEFENDER, 0); @@ -948,7 +948,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader */ enum eBattleStandard { - NPC_KING_OF_THE_MOUNTAINT_KC = 31766, + NPC_KING_OF_THE_MOUNTAINT_KC = 31766, }; class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader { @@ -959,11 +959,11 @@ public: { PrepareSpellScript(spell_q13280_13283_plant_battle_standard_SpellScript) void HandleDummy(SpellEffIndex /*effIndex*/) - { + { Unit* caster = GetCaster(); if (caster->IsVehicle()) if (Unit* player = caster->GetVehicleKit()->GetPassenger(0)) - player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC,0); + player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } void Register() diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 3dc1ed10f29..e9caa40255e 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -65,7 +65,7 @@ public: amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { Unit* target = GetTarget(); if (dmgInfo.GetDamage() < target->GetHealth()) @@ -125,7 +125,7 @@ public: amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while stun or fear if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index fcb026e0232..76dac9b59f1 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -62,7 +62,7 @@ class spell_sha_astral_shift : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount) { // reduces all damage taken while stun, fear or silence if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_FLEEING | UNIT_FLAG_SILENCED) || (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED) && GetTarget()->HasAuraWithMechanic(1<<MECHANIC_STUN))) @@ -250,7 +250,7 @@ class spell_sha_bloodlust : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_SATED)); } void ApplyDebuff() @@ -291,7 +291,7 @@ class spell_sha_heroism : public SpellScriptLoader void RemoveInvalidTargets(std::list<Unit*>& targets) { - targets.remove_if(Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); + targets.remove_if (Trinity::UnitAuraCheck(true, SHAMAN_SPELL_EXHAUSTION)); } void ApplyDebuff() diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 49fe2f2870c..6c54d130e53 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -68,7 +68,7 @@ class AreaTrigger_at_aldurthar_gate : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - switch(trigger->id) + switch (trigger->id) { case TRIGGER_SOUTH: player->KilledMonsterCredit(NPC_SOUTH_GATE, 0); break; case TRIGGER_CENTRAL: player->KilledMonsterCredit(NPC_CENTRAL_GATE, 0); break; @@ -205,7 +205,7 @@ class AreaTrigger_at_warsong_farms : public AreaTriggerScript { if (!player->isDead() && player->GetQuestStatus(QUEST_THE_WARSONG_FARMS) == QUEST_STATUS_INCOMPLETE) { - switch(trigger->id) + switch (trigger->id) { case AT_SLAUGHTERHOUSE: player->KilledMonsterCredit(NPC_CREDIT_SLAUGHTERHOUSE, 0); break; case AT_GRAINERY: player->KilledMonsterCredit(NPC_CREDIT_GRAINERY, 0); break; @@ -305,7 +305,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript WorldLocation pPosition; - switch(trigger->id) + switch (trigger->id) { case 5332: case 5338: @@ -357,7 +357,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript if (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && !player->isDead() && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED) { - switch(trigger->id) + switch (trigger->id) { case AT_SHOLAZAR: player->CastSpell(player, SPELL_SHOLAZAR_TO_UNGORO_TELEPORT, false); break; case AT_UNGORO: player->CastSpell(player, SPELL_UNGORO_TO_SHOLAZAR_TELEPORT, false); break; diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index b6030c62df4..e5c584df6e1 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -122,7 +122,7 @@ struct emerald_dragonAI : public WorldBossAI // Despawntime is 2 minutes, so reschedule it for new cast after 2 minutes + a minor "random time" (30 seconds at max) DoCast(me, SPELL_SEEPING_FOG_LEFT, true); DoCast(me, SPELL_SEEPING_FOG_RIGHT, true); - events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000,150000)); + events.ScheduleEvent(EVENT_SEEPING_FOG, urand(120000, 150000)); break; case EVENT_NOXIOUS_BREATH: // Noxious Breath is cast on random intervals, no less than 7.5 seconds between @@ -241,7 +241,7 @@ class spell_dream_fog_sleep : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(DreamFogTargetSelector()); + unitList.remove_if (DreamFogTargetSelector()); } void Register() @@ -292,7 +292,7 @@ class spell_mark_of_nature : public SpellScriptLoader void FilterTargets(std::list<Unit*>& unitList) { - unitList.remove_if(MarkOfNatureTargetSelector()); + unitList.remove_if (MarkOfNatureTargetSelector()); } void HandleEffect(SpellEffIndex effIndex) diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 07b6840b6c6..0592a452211 100755 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -68,7 +68,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group) { //! NOTE: - //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" + //! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER" switch (type) { case CHAT_MSG_PARTY: @@ -126,7 +126,7 @@ public: void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild) { - switch(type) + switch (type) { case CHAT_MSG_GUILD: if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_GUILD)) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 0bda63b4177..aa272d8157b 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -317,7 +317,7 @@ public: { uint32 Spell = 0; - switch(pFaction->faction) + switch (pFaction->faction) { case 1011: Spell = SPELL_REP_LC; break; case 935: Spell = SPELL_REP_SHAT; break; @@ -434,7 +434,7 @@ public: float fX, fY, fZ; pGO->GetClosePoint(fX, fY, fZ, pGO->GetObjectSize(), INTERACTION_DISTANCE); - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case GO_SHRINE_HAWK: BirdEntry = NPC_HAWK_GUARD; @@ -566,7 +566,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_BEAST, false); @@ -625,7 +625,7 @@ public: bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_SORCERER, false); @@ -675,7 +675,7 @@ public: bool OnGossipHello(Player* player, GameObject* pGO) { - switch(pGO->GetEntry()) + switch (pGO->GetEntry()) { case MATRIX_PUNCHOGRAPH_3005_A: if (player->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) @@ -853,7 +853,7 @@ public: pPrisoner->DisappearAndDie(); player->KilledMonsterCredit(NPC_EBON_BLADE_PRISONER_HUMAN, 0); - switch(pPrisoner->GetEntry()) + switch (pPrisoner->GetEntry()) { case NPC_EBON_BLADE_PRISONER_HUMAN: player->CastSpell(player, SPELL_SUMMON_BLADE_KNIGHT_H, true); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index a40405d3021..f869138d58f 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -194,7 +194,7 @@ public: void DoReplyToTextEmote(uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; @@ -207,7 +207,7 @@ public: void ReceiveEmote(Player* player, uint32 textEmote) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_STORMWIND_CITY_GUARD: case NPC_STORMWIND_CITY_PATROLLER: diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index f8095ba9c1e..c7dfd6355ef 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -54,7 +54,7 @@ public: bool disabled = false; //for special scripts - switch(itemId) + switch (itemId) { case 24538: if (player->GetAreaId() != 3628) @@ -418,7 +418,7 @@ public: } else player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); } else - player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL); + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index af3544d2bd3..149e1e455aa 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -426,7 +426,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -510,7 +510,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; @@ -601,7 +601,7 @@ public: void SendActionMenu(Player* player, Creature* creature, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -669,7 +669,7 @@ public: { if (uiAction) { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 11191: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction); @@ -1103,7 +1103,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break; case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break; diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 3bf33066189..ff83b0c1ec5 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -68,7 +68,7 @@ public: if (creature->isQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus if (player->HasItemCount(23843, 1, true)) @@ -189,7 +189,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) { player->PlayerTalkClass->ClearMenus(); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 392e20734a8..a5e5b467fc7 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -193,7 +193,7 @@ public: if (!lastSpawnedGuard) SpawnedGUID = 0; - switch(SpawnAssoc->spawnType) + switch (SpawnAssoc->spawnType) { case SPAWNTYPE_ALARMBOT: { @@ -348,7 +348,7 @@ public: void ReceiveEmote(Player* player, uint32 emote) { - switch(emote) + switch (emote) { case TEXT_EMOTE_CHICKEN: if (player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand() % 30 == 1) @@ -455,7 +455,7 @@ public: WorldPacket data; me->BuildHeartBeatMsg(&data); me->SendMessageToSet(&data, true); - switch(emote) + switch (emote) { case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); @@ -598,7 +598,7 @@ public: PatientDiedCount = 0; PatientSavedCount = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: for (uint8 i = 0; i < ALLIANCE_COORDS; ++i) @@ -826,7 +826,7 @@ void npc_doctor::npc_doctorAI::UpdateAI(uint32 const diff) std::vector<Location*>::iterator itr = Coordinates.begin() + rand() % Coordinates.size(); uint32 patientEntry = 0; - switch(me->GetEntry()) + switch (me->GetEntry()) { case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand() % 3]; @@ -944,7 +944,7 @@ public: if (Player* player = caster->ToPlayer()) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: if (player->GetQuestStatus(QUEST_MOON) == QUEST_STATUS_INCOMPLETE) @@ -1052,7 +1052,7 @@ public: { if (Unit* unit = Unit::GetUnit(*me, CasterGUID)) { - switch(me->GetEntry()) + switch (me->GetEntry()) { case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, unit); @@ -1313,7 +1313,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -1417,7 +1417,7 @@ public: void SendAction(Player* player, Creature* creature, uint32 action) { - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SENDACTION_SAYGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -1464,7 +1464,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(sender) + switch (sender) { case GOSSIP_SENDER_MAIN: SendAction(player, creature, action); @@ -1706,7 +1706,7 @@ public: //Add delta to make them not all hit the same time uint32 delta = (rand() % 7) * 100; me->SetStatFloatValue(UNIT_FIELD_BASEATTACKTIME, float(Info->baseattacktime + delta)); - me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER , float(Info->attackpower)); + me->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER, float(Info->attackpower)); // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) @@ -2211,7 +2211,7 @@ public: player->PlayerTalkClass->ClearMenus(); bool roll = urand(0, 1); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra player->CLOSE_GOSSIP_MENU(); @@ -2283,7 +2283,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->PlayerTalkClass->SendGossipMenu(TEXT_PETINFO, creature->GetGUID()); @@ -2383,7 +2383,7 @@ public: bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: player->CLOSE_GOSSIP_MENU(); @@ -2542,7 +2542,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) { player->PlayerTalkClass->ClearMenus(); - switch(action) + switch (action) { case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); @@ -2608,7 +2608,7 @@ public: bool noXPGain = player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN); bool doSwitch = false; - switch(action) + switch (action) { case GOSSIP_ACTION_INFO_DEF + 1://xp off { |