diff options
Diffstat (limited to 'src/server/scripts')
410 files changed, 4717 insertions, 4717 deletions
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 59abb8fa3a4..e5981b649be 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -107,7 +107,7 @@ public: switch(result) { case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_CREATED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_CREATED, account_name.c_str()); break; case AOR_NAME_TOO_LONG: handler->SendSysMessage(LANG_ACCOUNT_TOO_LONG); @@ -118,11 +118,11 @@ public: handler->SetSentErrorMessage(true); return false; case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED_SQL_ERROR, account_name.c_str()); handler->SetSentErrorMessage(true); return false; default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_CREATED, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -138,14 +138,14 @@ public: return false; ///- Get the account name from the command line - char *account_name_str=strtok ((char*)args," "); + char *account_name_str=strtok ((char*)args, " "); if (!account_name_str) return false; std::string account_name = account_name_str; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -153,7 +153,7 @@ public: uint32 account_id = sAccountMgr->GetId(account_name); if (!account_id) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -161,25 +161,25 @@ public: /// Commands not recommended call from chat, but support anyway /// can delete only for account with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL,account_id,true)) + if (handler->HasLowerSecurityAccount (NULL, account_id, true)) return false; AccountOpResult result = sAccountMgr->DeleteAccount(account_id); switch(result) { case AOR_OK: - handler->PSendSysMessage(LANG_ACCOUNT_DELETED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_DELETED, account_name.c_str()); break; case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; case AOR_DB_INTERNAL_ERROR: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED_SQL_ERROR, account_name.c_str()); handler->SetSentErrorMessage(true); return false; default: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_DELETED, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -191,7 +191,7 @@ public: static bool HandleAccountOnlineListCommand(ChatHandler* handler, const char* /*args*/) { ///- Get the list of accounts ID logged to the realm - QueryResult resultDB = CharacterDatabase.Query("SELECT name,account,map,zone FROM characters WHERE online > 0"); + QueryResult resultDB = CharacterDatabase.Query("SELECT name, account, map, zone FROM characters WHERE online > 0"); if (!resultDB) { handler->SendSysMessage(LANG_ACCOUNT_LIST_EMPTY); @@ -222,10 +222,10 @@ public: { Field *fieldsLogin = resultLogin->Fetch(); handler->PSendSysMessage(LANG_ACCOUNT_LIST_LINE, - fieldsLogin[0].GetCString(),name.c_str(),fieldsLogin[1].GetCString(),fieldsDB[2].GetUInt16(),fieldsDB[3].GetUInt16(),fieldsLogin[3].GetUInt32(),fieldsLogin[2].GetUInt32()); + fieldsLogin[0].GetCString(), name.c_str(), fieldsLogin[1].GetCString(), fieldsDB[2].GetUInt16(), fieldsDB[3].GetUInt16(), fieldsLogin[3].GetUInt32(), fieldsLogin[2].GetUInt32()); } else - handler->PSendSysMessage(LANG_ACCOUNT_LIST_ERROR,name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_LIST_ERROR, name.c_str()); }while (resultDB->NextRow()); @@ -245,14 +245,14 @@ public: std::string argstr = (char*)args; if (argstr == "on") { - LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%d'",handler->GetSession()->GetAccountId()); + LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED); return true; } if (argstr == "off") { - LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%d'",handler->GetSession()->GetAccountId()); + LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%d'", handler->GetSession()->GetAccountId()); handler->PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED); return true; } @@ -330,8 +330,8 @@ public: static bool HandleAccountSetAddonCommand(ChatHandler* handler, const char *args) { ///- Get the command line arguments - char *szAcc = strtok((char*)args," "); - char *szExp = strtok(NULL," "); + char *szAcc = strtok((char*)args, " "); + char *szExp = strtok(NULL, " "); if (!szAcc) return false; @@ -346,7 +346,7 @@ public: return false; account_id = player->GetSession()->GetAccountId(); - sAccountMgr->GetName(account_id,account_name); + sAccountMgr->GetName(account_id, account_name); szExp = szAcc; } else @@ -355,7 +355,7 @@ public: account_name = szAcc; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -363,7 +363,7 @@ public: account_id = sAccountMgr->GetId(account_name); if (!account_id) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -373,7 +373,7 @@ public: // Let set addon state only for lesser (strong) security level // or to self account if (handler->GetSession() && handler->GetSession()->GetAccountId () != account_id && - handler->HasLowerSecurityAccount (NULL,account_id,true)) + handler->HasLowerSecurityAccount (NULL, account_id, true)) return false; int expansion = atoi(szExp); //get int anyway (0 if error) @@ -381,8 +381,8 @@ public: return false; // No SQL injection - LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'",expansion,account_id); - handler->PSendSysMessage(LANG_ACCOUNT_SETADDON,account_name.c_str(),account_id,expansion); + LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id); + handler->PSendSysMessage(LANG_ACCOUNT_SETADDON, account_name.c_str(), account_id, expansion); return true; } @@ -417,7 +417,7 @@ public: targetAccountName = arg1; if (!AccountMgr::normalizeString(targetAccountName)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,targetAccountName.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, targetAccountName.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -478,7 +478,7 @@ public: LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u' AND (RealmID = '%d' OR RealmID = '-1')", targetAccountId, realmID); if (gm != 0) - LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u','%d','%d')", targetAccountId, gm, realmID); + LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', '%d')", targetAccountId, gm, realmID); handler->PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm); return true; } @@ -490,9 +490,9 @@ public: return false; ///- Get the command line arguments - char *szAccount = strtok ((char*)args," "); - char *szPassword1 = strtok (NULL," "); - char *szPassword2 = strtok (NULL," "); + char *szAccount = strtok ((char*)args, " "); + char *szPassword1 = strtok (NULL, " "); + char *szPassword2 = strtok (NULL, " "); if (!szAccount||!szPassword1 || !szPassword2) return false; @@ -500,7 +500,7 @@ public: std::string account_name = szAccount; if (!AccountMgr::normalizeString(account_name)) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -508,17 +508,17 @@ public: uint32 targetAccountId = sAccountMgr->GetId(account_name); if (!targetAccountId) { - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; } /// can set password only for target with less security /// This is also reject self apply in fact - if (handler->HasLowerSecurityAccount (NULL,targetAccountId,true)) + if (handler->HasLowerSecurityAccount (NULL, targetAccountId, true)) return false; - if (strcmp(szPassword1,szPassword2)) + if (strcmp(szPassword1, szPassword2)) { handler->SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH); handler->SetSentErrorMessage (true); @@ -533,7 +533,7 @@ public: handler->SendSysMessage(LANG_COMMAND_PASSWORD); break; case AOR_NAME_NOT_EXIST: - handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str()); + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, account_name.c_str()); handler->SetSentErrorMessage(true); return false; case AOR_PASS_TOO_LONG: diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 237fa210933..94174e9cb82 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -58,7 +58,7 @@ public: { "opcode", SEC_ADMINISTRATOR, false, &HandleDebugSendOpcodeCommand, "", NULL }, { "poi", SEC_ADMINISTRATOR, false, &HandleDebugSendPoiCommand, "", NULL }, { "qpartymsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestPartyMsgCommand, "", NULL }, - { "qinvalidmsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestInvalidMsgCommand,"", NULL }, + { "qinvalidmsg", SEC_ADMINISTRATOR, false, &HandleDebugSendQuestInvalidMsgCommand, "", NULL }, { "sellerror", SEC_ADMINISTRATOR, false, &HandleDebugSendSellErrorCommand, "", NULL }, { "setphaseshift", SEC_ADMINISTRATOR, false, &HandleDebugSendSetPhaseShiftCommand, "", NULL }, { "spellfail", SEC_ADMINISTRATOR, false, &HandleDebugSendSpellFailCommand, "", NULL }, @@ -73,7 +73,7 @@ public: { "arena", SEC_ADMINISTRATOR, false, &HandleDebugArenaCommand, "", NULL }, { "bg", SEC_ADMINISTRATOR, false, &HandleDebugBattlegroundCommand, "", NULL }, { "getitemstate", SEC_ADMINISTRATOR, false, &HandleDebugGetItemStateCommand, "", NULL }, - { "lootrecipient", SEC_GAMEMASTER, false, &HandleDebugGetLootRecipientCommand,"", NULL }, + { "lootrecipient", SEC_GAMEMASTER, false, &HandleDebugGetLootRecipientCommand, "", NULL }, { "getvalue", SEC_ADMINISTRATOR, false, &HandleDebugGetValueCommand, "", NULL }, { "getitemvalue", SEC_ADMINISTRATOR, false, &HandleDebugGetItemValueCommand, "", NULL }, { "Mod32Value", SEC_ADMINISTRATOR, false, &HandleDebugMod32ValueCommand, "", NULL }, @@ -85,7 +85,7 @@ public: { "spawnvehicle", SEC_ADMINISTRATOR, false, &HandleDebugSpawnVehicleCommand, "", NULL }, { "setvid", SEC_ADMINISTRATOR, false, &HandleDebugSetVehicleIdCommand, "", NULL }, { "entervehicle", SEC_ADMINISTRATOR, false, &HandleDebugEnterVehicleCommand, "", NULL }, - { "uws", SEC_ADMINISTRATOR, false, &HandleDebugUpdateWorldStateCommand,"", NULL }, + { "uws", SEC_ADMINISTRATOR, false, &HandleDebugUpdateWorldStateCommand, "", NULL }, { "update", SEC_ADMINISTRATOR, false, &HandleDebugUpdateCommand, "", NULL }, { "itemexpire", SEC_ADMINISTRATOR, false, &HandleDebugItemExpireCommand, "", NULL }, { "areatriggers", SEC_ADMINISTRATOR, false, &HandleDebugAreaTriggersCommand, "", NULL }, @@ -177,9 +177,9 @@ public: } if (handler->GetSession()->GetPlayer()->GetSelection()) - unit->PlayDistanceSound(dwSoundId,handler->GetSession()->GetPlayer()); + unit->PlayDistanceSound(dwSoundId, handler->GetSession()->GetPlayer()); else - unit->PlayDirectSound(dwSoundId,handler->GetSession()->GetPlayer()); + unit->PlayDirectSound(dwSoundId, handler->GetSession()->GetPlayer()); handler->PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId); return true; @@ -239,7 +239,7 @@ public: uint32 icon = atol(icon_text); uint32 flags = atol(flags_text); - sLog->outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); + sLog->outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon, flags); pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI"); return true; } @@ -736,14 +736,14 @@ public: std::list<HostileReference*>& tlist = target->getThreatManager().getThreatList(); std::list<HostileReference*>::iterator itr; uint32 cnt = 0; - handler->PSendSysMessage("Threat list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + handler->PSendSysMessage("Threat list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); for (itr = tlist.begin(); itr != tlist.end(); ++itr) { Unit* unit = (*itr)->getTarget(); if (!unit) continue; ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), (*itr)->getThreat()); } handler->SendSysMessage("End of threat list."); return true; @@ -756,13 +756,13 @@ public: target = handler->GetSession()->GetPlayer(); HostileReference* ref = target->getHostileRefManager().getFirst(); uint32 cnt = 0; - handler->PSendSysMessage("Hostil reference list of %s (guid %u)",target->GetName(), target->GetGUIDLow()); + handler->PSendSysMessage("Hostil reference list of %s (guid %u)", target->GetName(), target->GetGUIDLow()); while (ref) { if (Unit * unit = ref->getSource()->getOwner()) { ++cnt; - handler->PSendSysMessage(" %u. %s (guid %u) - threat %f",cnt,unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); + handler->PSendSysMessage(" %u. %s (guid %u) - threat %f", cnt, unit->GetName(), unit->GetGUIDLow(), ref->getThreat()); } ref = ref->next(); } @@ -1003,11 +1003,11 @@ public: { // reset all states for (int i = 1; i <= 32; ++i) - unit->ModifyAuraState(AuraState(i),false); + unit->ModifyAuraState(AuraState(i), false); return true; } - unit->ModifyAuraState(AuraState(abs(state)),state > 0); + unit->ModifyAuraState(AuraState(abs(state)), state > 0); return true; } @@ -1048,13 +1048,13 @@ public: { iValue = (uint32)atoi(py); target->SetUInt32Value(Opcode , iValue); - handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode,iValue); + handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { fValue = (float)atof(py); target->SetFloatValue(Opcode , fValue); - handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode,fValue); + handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } return true; @@ -1132,7 +1132,7 @@ public: CurrentValue += Value; handler->GetSession()->GetPlayer()->SetUInt32Value(Opcode , (uint32)CurrentValue); - handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode,CurrentValue); + handler->PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode, CurrentValue); return true; } @@ -1175,15 +1175,15 @@ public: { value=chr->GetUInt32Value(updateIndex); - handler->PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(),updateIndex,value); + handler->PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(), updateIndex, value); return true; } value=atoi(pvalue); - handler->PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(),updateIndex,value); + handler->PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(), updateIndex, value); - chr->SetUInt32Value(updateIndex,value); + chr->SetUInt32Value(updateIndex, value); return true; } diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 88feae9e561..20ade38d676 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -64,9 +64,9 @@ public: GameEventData const& eventData = events[event_id]; if (handler->GetSession()) - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,event_id,event_id,eventData.description.c_str(),active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, event_id, event_id, eventData.description.c_str(), active); else - handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,event_id,eventData.description.c_str(),active); + handler->PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, event_id, eventData.description.c_str(), active); ++counter; } @@ -84,7 +84,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -121,8 +121,8 @@ public: std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE); std::string lengthStr = secsToTimeString(eventData.length * MINUTE); - handler->PSendSysMessage(LANG_EVENT_INFO,event_id,eventData.description.c_str(),activeStr, - startTimeStr.c_str(),endTimeStr.c_str(),occurenceStr.c_str(),lengthStr.c_str(), + handler->PSendSysMessage(LANG_EVENT_INFO, event_id, eventData.description.c_str(), activeStr, + startTimeStr.c_str(), endTimeStr.c_str(), occurenceStr.c_str(), lengthStr.c_str(), nextStr.c_str()); return true; } @@ -133,7 +133,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -159,12 +159,12 @@ public: GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); if (activeEvents.find(event_id) != activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id); + handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, event_id); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StartEvent(event_id,true); + sGameEventMgr->StartEvent(event_id, true); return true; } @@ -174,7 +174,7 @@ public: return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameevent"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameevent"); if (!cId) return false; @@ -201,12 +201,12 @@ public: if (activeEvents.find(event_id) == activeEvents.end()) { - handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE,event_id); + handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, event_id); handler->SetSentErrorMessage(true); return false; } - sGameEventMgr->StopEvent(event_id,true); + sGameEventMgr->StopEvent(event_id, true); return true; } }; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 1ed451ed50b..90fbe1d1549 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -153,7 +153,7 @@ public: static bool HandleGMListFullCommand(ChatHandler* handler, const char* /*args*/) { ///- Get the accounts with GM Level >0 - QueryResult result = LoginDatabase.Query("SELECT a.username,aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel > 0"); + QueryResult result = LoginDatabase.Query("SELECT a.username, aa.gmlevel FROM account a, account_access aa WHERE a.id=aa.id AND aa.gmlevel > 0"); if (result) { handler->SendSysMessage(LANG_GMLIST); diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index b4ca8af6d92..1dbc4236bff 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -76,7 +76,7 @@ public: Player* _player = handler->GetSession()->GetPlayer(); // "id" or number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* pParam1 = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* pParam1 = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!pParam1) return false; @@ -89,10 +89,10 @@ public: // Get the "creature_template.entry" // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* tail = strtok(NULL,""); + char* tail = strtok(NULL, ""); if (!tail) return false; - char* cId = handler->extractKeyFromLink(tail,"Hcreature_entry"); + char* cId = handler->extractKeyFromLink(tail, "Hcreature_entry"); if (!cId) return false; @@ -123,7 +123,7 @@ public: } //sLog->outError("DEBUG: %s", whereClause.c_str()); - QueryResult result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map FROM creature %s", whereClause.str().c_str()); + QueryResult result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z, orientation, map FROM creature %s", whereClause.str().c_str()); if (!result) { handler->SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND); @@ -140,9 +140,9 @@ public: float ort = fields[3].GetFloat(); int mapid = fields[4].GetUInt16(); - if (!MapManager::IsValidMapCoord(mapid,x,y,z,ort)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -179,14 +179,14 @@ public: WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(i_gyId); if (!gy) { - handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST,i_gyId); + handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, i_gyId); handler->SetSentErrorMessage(true); return false; } - if (!MapManager::IsValidMapCoord(gy->map_id,gy->x,gy->y,gy->z)) + if (!MapManager::IsValidMapCoord(gy->map_id, gy->x, gy->y, gy->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,gy->x,gy->y,gy->map_id); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->map_id); handler->SetSentErrorMessage(true); return false; } @@ -228,9 +228,9 @@ public: float x = (grid_x-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; float y = (grid_y-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS; - if (!MapManager::IsValidMapCoord(mapid,x,y)) + if (!MapManager::IsValidMapCoord(mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -260,7 +260,7 @@ public: Player* _player = handler->GetSession()->GetPlayer(); // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -287,9 +287,9 @@ public: return false; } - if (!MapManager::IsValidMapCoord(mapid,x,y,z,ort)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z, ort)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -314,7 +314,7 @@ public: if (!*args) return false; - char* cNodeId = handler->extractKeyFromLink((char*)args,"Htaxinode"); + char* cNodeId = handler->extractKeyFromLink((char*)args, "Htaxinode"); if (!cNodeId) return false; @@ -325,15 +325,15 @@ public: TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i_nodeId); if (!node) { - handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND,i_nodeId); + handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, i_nodeId); handler->SetSentErrorMessage(true); return false; } if ((node->x == 0.0f && node->y == 0.0f && node->z == 0.0f) || - !MapManager::IsValidMapCoord(node->map_id,node->x,node->y,node->z)) + !MapManager::IsValidMapCoord(node->map_id, node->x, node->y, node->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,node->x,node->y,node->map_id); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, node->x, node->y, node->map_id); handler->SetSentErrorMessage(true); return false; } @@ -370,14 +370,14 @@ public: AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(i_atId); if (!at) { - handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND,i_atId); + handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, i_atId); handler->SetSentErrorMessage(true); return false; } - if (!MapManager::IsValidMapCoord(at->mapid,at->x,at->y,at->z)) + if (!MapManager::IsValidMapCoord(at->mapid, at->x, at->y, at->z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,at->x,at->y,at->mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, at->x, at->y, at->mapid); handler->SetSentErrorMessage(true); return false; } @@ -405,9 +405,9 @@ public: char* px = strtok((char*)args, " "); char* py = strtok(NULL, " "); - char* tail = strtok(NULL,""); + char* tail = strtok(NULL, ""); - char* cAreaId = handler->extractKeyFromLink(tail,"Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r + char* cAreaId = handler->extractKeyFromLink(tail, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r if (!px || !py) return false; @@ -425,7 +425,7 @@ public: if (x < 0 || x > 100 || y < 0 || y > 100 || !areaEntry) { - handler->PSendSysMessage(LANG_INVALID_ZONE_COORD,x,y,areaid); + handler->PSendSysMessage(LANG_INVALID_ZONE_COORD, x, y, areaid); handler->SetSentErrorMessage(true); return false; } @@ -437,16 +437,16 @@ public: if (map->Instanceable()) { - handler->PSendSysMessage(LANG_INVALID_ZONE_MAP,areaEntry->ID,areaEntry->area_name[handler->GetSessionDbcLocale()],map->GetId(),map->GetMapName()); + handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name[handler->GetSessionDbcLocale()], map->GetId(), map->GetMapName()); handler->SetSentErrorMessage(true); return false; } - Zone2MapCoordinates(x,y,zoneEntry->ID); + Zone2MapCoordinates(x, y, zoneEntry->ID); - if (!MapManager::IsValidMapCoord(zoneEntry->mapid,x,y)) + if (!MapManager::IsValidMapCoord(zoneEntry->mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,zoneEntry->mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid); handler->SetSentErrorMessage(true); return false; } @@ -489,9 +489,9 @@ public: else mapid = _player->GetMapId(); - if (!MapManager::IsValidMapCoord(mapid,x,y)) + if (!MapManager::IsValidMapCoord(mapid, x, y)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } @@ -538,9 +538,9 @@ public: else mapid = _player->GetMapId(); - if (!MapManager::IsValidMapCoord(mapid,x,y,z)) + if (!MapManager::IsValidMapCoord(mapid, x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapid); handler->SetSentErrorMessage(true); return false; } diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 857ee0fec85..726b937cf95 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -74,7 +74,7 @@ public: if (!*args) return false; - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -86,7 +86,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -111,7 +111,7 @@ public: return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); if (!cId) return false; @@ -125,7 +125,7 @@ public: if (!gInfo) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); handler->SetSentErrorMessage(true); return false; } @@ -133,8 +133,8 @@ public: if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) { // report to DB errors log as in loading case - sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.",id, gInfo->type, gInfo->displayId); - handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA,id); + sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.", id, gInfo->type, gInfo->displayId); + handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, id); handler->SetSentErrorMessage(true); return false; } @@ -163,7 +163,7 @@ public: } // fill the gameobject data and save to the db - pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()),chr->GetPhaseMaskForSpawn()); + pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); // this will generate a new guid if the object is in an instance if (!pGameObj->LoadFromDB(db_lowGUID, map)) @@ -177,7 +177,7 @@ public: // TODO: is it really necessary to add both the real and DB table guid here ? sObjectMgr->AddGameobjectToGrid(db_lowGUID, sObjectMgr->GetGOData(db_lowGUID)); - handler->PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name.c_str(),db_lowGUID,x,y,z); + handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, id, gInfo->name.c_str(), db_lowGUID, x, y, z); return true; } @@ -208,7 +208,7 @@ public: uint32 id = atoi(charID); - chr->SummonGameObject(id,x,y,z,ang,0,0,rot2,rot3,spawntm); + chr->SummonGameObject(id, x, y, z, ang, 0, 0, rot2, rot3, spawntm); return true; } @@ -221,7 +221,7 @@ public: if (*args) { // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject_entry"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject_entry"); if (!cId) return false; @@ -229,15 +229,15 @@ public: if (id) result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id); + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), id); else { std::string name = cId; WorldDatabase.escape_string(name); result = WorldDatabase.PQuery( "SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ " - "FROM gameobject,gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" ORDER BY order_ ASC LIMIT 1", - pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),name.c_str()); + "FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1", + pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(), name.c_str()); } } else @@ -254,7 +254,7 @@ public: initString =false; } else - eventFilter << "," << *itr; + eventFilter << ", " << *itr; } if (!initString) @@ -266,7 +266,7 @@ public: "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject " "LEFT OUTER JOIN game_event_gameobject on gameobject.guid = game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10", handler->GetSession()->GetPlayer()->GetPositionX(), handler->GetSession()->GetPlayer()->GetPositionY(), handler->GetSession()->GetPlayer()->GetPositionZ(), - handler->GetSession()->GetPlayer()->GetMapId(),eventFilter.str().c_str()); + handler->GetSession()->GetPlayer()->GetMapId(), eventFilter.str().c_str()); } if (!result) @@ -299,7 +299,7 @@ public: if (!found) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); return false; } @@ -307,11 +307,11 @@ public: if (!goI) { - handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id); + handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, id); return false; } - GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid,id,HIGHGUID_GAMEOBJECT)); + GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid, id, HIGHGUID_GAMEOBJECT)); handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name.c_str(), lowguid, id, x, y, z, mapid, o, phase); @@ -321,10 +321,10 @@ public: if (curRespawnDelay < 0) curRespawnDelay = 0; - std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true); - std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); + std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay, true); + std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true); - handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str()); + handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); } return true; } @@ -333,7 +333,7 @@ public: static bool HandleGameObjectDeleteCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -345,7 +345,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -357,7 +357,7 @@ public: uint64 owner_guid = obj->GetOwnerGUID(); if (owner_guid) { - Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(),owner_guid); + Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), owner_guid); if (!owner || !IS_PLAYER_GUID(owner_guid)) { handler->PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, GUID_LOPART(owner_guid), obj->GetGUIDLow()); @@ -365,7 +365,7 @@ public: return false; } - owner->RemoveGameObject(obj,false); + owner->RemoveGameObject(obj, false); } obj->SetRespawnTime(0); // not save respawn time @@ -381,7 +381,7 @@ public: static bool HandleGameObjectTurnCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -393,7 +393,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -432,7 +432,7 @@ public: static bool HandleGameObjectMoveCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -444,7 +444,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -473,9 +473,9 @@ public: float y = (float)atof(py); float z = (float)atof(pz); - if (!MapManager::IsValidMapCoord(obj->GetMapId(),x,y,z)) + if (!MapManager::IsValidMapCoord(obj->GetMapId(), x, y, z)) { - handler->PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,obj->GetMapId()); + handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, obj->GetMapId()); handler->SetSentErrorMessage(true); return false; } @@ -497,7 +497,7 @@ public: static bool HandleGameObjectSetPhaseCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hgameobject"); + char* cId = handler->extractKeyFromLink((char*)args, "Hgameobject"); if (!cId) return false; @@ -509,7 +509,7 @@ public: // by DB guid if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid)) - obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); + obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, go_data->id); if (!obj) { @@ -527,7 +527,7 @@ public: return false; } - obj->SetPhaseMask(phasemask,true); + obj->SetPhaseMask(phasemask, true); obj->SaveToDB(); return true; } @@ -542,7 +542,7 @@ public: "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ " "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), - pl->GetMapId(),pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),distance*distance); + pl->GetMapId(), pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), distance*distance); if (result) { @@ -567,7 +567,7 @@ public: } while (result->NextRow()); } - handler->PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE,distance,count); + handler->PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE, distance, count); return true; } @@ -659,7 +659,7 @@ public: gobj->SetByteValue(GAMEOBJECT_BYTES_1, type, state); else if (type == 4) { - WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4); + WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM, 8+4); data << gobj->GetGUID(); data << (uint32)(state); gobj->SendMessageToSet(&data, true); diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 5b88e83371f..347a527bead 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -37,7 +37,7 @@ public: static ChatCommand learnAllMyCommandTable[] = { { "class", SEC_ADMINISTRATOR, false, &HandleLearnAllMyClassCommand, "", NULL }, - { "pettalents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyPetTalentsCommand,"", NULL }, + { "pettalents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyPetTalentsCommand, "", NULL }, { "spells", SEC_ADMINISTRATOR, false, &HandleLearnAllMySpellsCommand, "", NULL }, { "talents", SEC_ADMINISTRATOR, false, &HandleLearnAllMyTalentsCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } @@ -83,13 +83,13 @@ public: if (!spell || !sSpellStore.LookupEntry(spell)) return false; - char const* allStr = strtok(NULL," "); + char const* allStr = strtok(NULL, " "); bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer())) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer())) { - handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell); + handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell); handler->SetSentErrorMessage(true); return false; } @@ -99,7 +99,7 @@ public: if (targetPlayer == handler->GetSession()->GetPlayer()) handler->SendSysMessage(LANG_YOU_KNOWN_SPELL); else - handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL,handler->GetNameLink(targetPlayer).c_str()); + handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL, handler->GetNameLink(targetPlayer).c_str()); handler->SetSentErrorMessage(true); return false; } @@ -172,7 +172,7 @@ public: continue; // skip broken spells - if (!SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; handler->GetSession()->GetPlayer()->learnSpell(i, false); @@ -215,7 +215,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -294,7 +294,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,handler->GetSession()->GetPlayer(),false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false)) continue; // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree) @@ -320,13 +320,13 @@ public: static bool HandleLearnAllDefaultCommand(ChatHandler* handler, const char* args) { Player* target; - if (!handler->extractPlayerTarget((char*)args,&target)) + if (!handler->extractPlayerTarget((char*)args, &target)) return false; target->learnDefaultSpells(); target->learnQuestRewardedSpells(); - handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,handler->GetNameLink(target).c_str()); + handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST, handler->GetNameLink(target).c_str()); return true; } @@ -342,7 +342,7 @@ public: if ((skillInfo->categoryId == SKILL_CATEGORY_PROFESSION || skillInfo->categoryId == SKILL_CATEGORY_SECONDARY) && skillInfo->canLink) // only prof. with recipes have { - HandleLearnSkillRecipesHelper(handler->GetSession()->GetPlayer(),skillInfo->id); + HandleLearnSkillRecipesHelper(handler->GetSession()->GetPlayer(), skillInfo->id); } } @@ -367,7 +367,7 @@ public: std::wstring wnamepart; - if (!Utf8toWStr(args,wnamepart)) + if (!Utf8toWStr(args, wnamepart)) return false; // converting string that we try to find to lower case @@ -419,14 +419,14 @@ public: if (!targetSkillInfo) return false; - HandleLearnSkillRecipesHelper(target,targetSkillInfo->id); + HandleLearnSkillRecipesHelper(target, targetSkillInfo->id); uint16 maxLevel = target->GetPureMaxSkillValue(targetSkillInfo->id); target->SetSkill(targetSkillInfo->id, target->GetSkillStep(targetSkillInfo->id), maxLevel, maxLevel); handler->PSendSysMessage(LANG_COMMAND_LEARN_ALL_RECIPES, name.c_str()); return true; } - static void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) + static void HandleLearnSkillRecipesHelper(Player* player, uint32 skill_id) { uint32 classmask = player->getClassMask(); @@ -453,7 +453,7 @@ public: continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId); - if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, player, false)) continue; player->learnSpell(skillLine->spellId, false); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 60944575d68..697129f2135 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -139,7 +139,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_MANA_CHANGED, handler->GetNameLink().c_str(), mana, manam); - target->SetMaxPower(POWER_MANA,manam); + target->SetMaxPower(POWER_MANA, manam); target->SetPower(POWER_MANA, mana); return true; @@ -188,10 +188,10 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_ENERGY_CHANGED, handler->GetNameLink().c_str(), energy/10, energym/10); - target->SetMaxPower(POWER_ENERGY,energym); + target->SetMaxPower(POWER_ENERGY, energym); target->SetPower(POWER_ENERGY, energy); - sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY),target->GetMaxPower(POWER_ENERGY)); + sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY)); return true; } @@ -239,7 +239,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_RAGE_CHANGED, handler->GetNameLink().c_str(), rage/10, ragem/10); - target->SetMaxPower(POWER_RAGE,ragem); + target->SetMaxPower(POWER_RAGE, ragem); target->SetPower(POWER_RAGE, rage); return true; @@ -273,7 +273,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_RUNIC_POWER_CHANGED, handler->GetNameLink().c_str(), rune/10, runem/10); - target->SetMaxPower(POWER_RUNIC_POWER,runem); + target->SetMaxPower(POWER_RUNIC_POWER, runem); target->SetPower(POWER_RUNIC_POWER, rune); return true; @@ -285,7 +285,7 @@ public: if (!*args) return false; - char* pfactionid = handler->extractKeyFromLink((char*)args,"Hfaction"); + char* pfactionid = handler->extractKeyFromLink((char*)args, "Hfaction"); Creature* target = handler->getSelectedCreature(); if (!target) @@ -303,7 +303,7 @@ public: uint32 flag = target->GetUInt32Value(UNIT_FIELD_FLAGS); uint32 npcflag = target->GetUInt32Value(UNIT_NPC_FLAGS); uint32 dyflag = target->GetUInt32Value(UNIT_DYNAMIC_FLAGS); - handler->PSendSysMessage(LANG_CURRENT_FACTION,target->GetGUIDLow(),factionid,flag,npcflag,dyflag); + handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag); } return true; } @@ -347,12 +347,12 @@ public: return false; } - handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUIDLow(),factionid,flag,npcflag,dyflag); + handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUIDLow(), factionid, flag, npcflag, dyflag); target->setFaction(factionid); - target->SetUInt32Value(UNIT_FIELD_FLAGS,flag); - target->SetUInt32Value(UNIT_NPC_FLAGS,npcflag); - target->SetUInt32Value(UNIT_DYNAMIC_FLAGS,dyflag); + target->SetUInt32Value(UNIT_FIELD_FLAGS, flag); + target->SetUInt32Value(UNIT_NPC_FLAGS, npcflag); + target->SetUInt32Value(UNIT_DYNAMIC_FLAGS, dyflag); return true; } @@ -488,7 +488,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -497,11 +497,11 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_ASPEED_CHANGED, handler->GetNameLink().c_str(), ASpeed); - target->SetSpeed(MOVE_WALK, ASpeed,true); - target->SetSpeed(MOVE_RUN, ASpeed,true); - target->SetSpeed(MOVE_SWIM, ASpeed,true); - //target->SetSpeed(MOVE_TURN, ASpeed,true); - target->SetSpeed(MOVE_FLIGHT, ASpeed,true); + target->SetSpeed(MOVE_WALK, ASpeed, true); + target->SetSpeed(MOVE_RUN, ASpeed, true); + target->SetSpeed(MOVE_SWIM, ASpeed, true); + //target->SetSpeed(MOVE_TURN, ASpeed, true); + target->SetSpeed(MOVE_FLIGHT, ASpeed, true); return true; } @@ -536,7 +536,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -545,7 +545,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_SPEED_CHANGED, handler->GetNameLink().c_str(), Speed); - target->SetSpeed(MOVE_RUN,Speed,true); + target->SetSpeed(MOVE_RUN, Speed, true); return true; } @@ -581,7 +581,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -590,7 +590,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_SWIM_SPEED_CHANGED, handler->GetNameLink().c_str(), Swim); - target->SetSpeed(MOVE_SWIM,Swim,true); + target->SetSpeed(MOVE_SWIM, Swim, true); return true; } @@ -626,7 +626,7 @@ public: if (target->isInFlight()) { - handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT,targetNameLink.c_str()); + handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, targetNameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -635,7 +635,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_BACK_SPEED_CHANGED, handler->GetNameLink().c_str(), BSpeed); - target->SetSpeed(MOVE_RUN_BACK,BSpeed,true); + target->SetSpeed(MOVE_RUN_BACK, BSpeed, true); return true; } @@ -671,7 +671,7 @@ public: if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_YOURS_FLY_SPEED_CHANGED, handler->GetNameLink().c_str(), FSpeed); - target->SetSpeed(MOVE_FLIGHT,FSpeed,true); + target->SetSpeed(MOVE_FLIGHT, FSpeed, true); return true; } @@ -1148,7 +1148,7 @@ public: if (handler->HasLowerSecurity(target, 0)) return false; - char* factionTxt = handler->extractKeyFromLink((char*)args,"Hfaction"); + char* factionTxt = handler->extractKeyFromLink((char*)args, "Hfaction"); if (!factionTxt) return false; @@ -1164,7 +1164,7 @@ public: { std::string rankStr = rankTxt; std::wstring wrankStr; - if (!Utf8toWStr(rankStr,wrankStr)) + if (!Utf8toWStr(rankStr, wrankStr)) return false; wstrToLower(wrankStr); @@ -1177,12 +1177,12 @@ public: continue; std::wstring wrank; - if (!Utf8toWStr(rank,wrank)) + if (!Utf8toWStr(rank, wrank)) continue; wstrToLower(wrank); - if (wrank.substr(0,wrankStr.size()) == wrankStr) + if (wrank.substr(0, wrankStr.size()) == wrankStr) { char *deltaTxt = strtok(NULL, " "); if (deltaTxt) @@ -1224,7 +1224,7 @@ public: return false; } - target->GetReputationMgr().SetReputation(factionEntry,amount); + target->GetReputationMgr().SetReputation(factionEntry, amount); handler->PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->name[handler->GetSessionDbcLocale()], factionId, handler->GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry)); return true; @@ -1267,7 +1267,7 @@ public: else if (target->GetTypeId() == TYPEID_PLAYER && handler->HasLowerSecurity(target->ToPlayer(), 0)) return false; - target->SetPhaseMask(phasemask,true); + target->SetPhaseMask(phasemask, true); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 1309bc959f5..6e1ea1a6be8 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -109,7 +109,7 @@ public: { if (!*args) return false; - char* charID = handler->extractKeyFromLink((char*)args,"Hcreature_entry"); + char* charID = handler->extractKeyFromLink((char*)args, "Hcreature_entry"); if (!charID) return false; @@ -161,7 +161,7 @@ public: if (!*args) return false; - char* pitem = handler->extractKeyFromLink((char*)args,"Hitem"); + char* pitem = handler->extractKeyFromLink((char*)args, "Hitem"); if (!pitem) { handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -193,17 +193,17 @@ public: uint32 vendor_entry = vendor ? vendor->GetEntry() : 0; - if (!sObjectMgr->IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,handler->GetSession()->GetPlayer())) + if (!sObjectMgr->IsVendorItemValid(vendor_entry, itemId, maxcount, incrtime, extendedcost, handler->GetSession()->GetPlayer())) { handler->SetSentErrorMessage(true); return false; } - sObjectMgr->AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost); + sObjectMgr->AddVendorItem(vendor_entry, itemId, maxcount, incrtime, extendedcost); ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId); - handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,itemTemplate->Name1.c_str(), maxcount,incrtime,extendedcost); + handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST, itemId, itemTemplate->Name1.c_str(), maxcount, incrtime, extendedcost); return true; } @@ -222,7 +222,7 @@ public: /* FIXME: impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // attempt check creature existence by DB data @@ -252,7 +252,7 @@ public: //WaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), wait, 0); // update movement type - WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE,lowguid); + WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, lowguid); if (pCreature && pCreature->GetWaypointPath()) { pCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); @@ -358,7 +358,7 @@ public: if (*args) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* cId = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!cId) return false; @@ -403,7 +403,7 @@ public: return false; } - char* pitem = handler->extractKeyFromLink((char*)args,"Hitem"); + char* pitem = handler->extractKeyFromLink((char*)args, "Hitem"); if (!pitem) { handler->SendSysMessage(LANG_COMMAND_NEEDITEMSEND); @@ -412,16 +412,16 @@ public: } uint32 itemId = atol(pitem); - if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(),itemId)) + if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(), itemId)) { - handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId); + handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId); handler->SetSentErrorMessage(true); return false; } ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId); - handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,itemTemplate->Name1.c_str()); + handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST, itemId, itemTemplate->Name1.c_str()); return true; } @@ -533,19 +533,19 @@ public: int64 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL); if (curRespawnDelay < 0) curRespawnDelay = 0; - std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay),true); - std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); + std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), true); + std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), true); handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetDBTableGUIDLow(), target->GetGUIDLow(), faction, npcflags, Entry, displayid, nativeid); handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); - handler->PSendSysMessage(LANG_NPCINFO_HEALTH,target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); + handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction()); - handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str()); - handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId); + handler->PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(), curRespawnDelayStr.c_str()); + handler->PSendSysMessage(LANG_NPCINFO_LOOT, cInfo->lootid, cInfo->pickpocketLootId, cInfo->SkinLootId); handler->PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId()); handler->PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask()); handler->PSendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor()); - handler->PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); + handler->PSendSysMessage(LANG_NPCINFO_POSITION, float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ())); if ((npcflags & UNIT_NPC_FLAG_VENDOR)) { @@ -569,7 +569,7 @@ public: if (!pCreature) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hcreature"); + char* cId = handler->extractKeyFromLink((char*)args, "Hcreature"); if (!cId) return false; @@ -577,7 +577,7 @@ public: /* FIXME: impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // Attempting creature load from DB data @@ -624,7 +624,7 @@ public: const_cast<CreatureData*>(data)->posZ = z; const_cast<CreatureData*>(data)->orientation = o; } - pCreature->GetMap()->CreatureRelocation(pCreature,x, y, z,o); + pCreature->GetMap()->CreatureRelocation(pCreature, x, y, z, o); pCreature->GetMotionMaster()->Initialize(); if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { @@ -655,7 +655,7 @@ public: if (target->GetGUIDTransport()) WorldDatabase.PQuery("UPDATE creature_transport SET emote=%u WHERE transport_entry=%u AND guid=%u", emote, target->GetTransport()->GetEntry(), target->GetGUIDTransport()); - target->SetUInt32Value(UNIT_NPC_EMOTESTATE,emote); + target->SetUInt32Value(UNIT_NPC_EMOTESTATE, emote); return true; } @@ -764,7 +764,7 @@ public: /* impossible without entry if (lowguid) - pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); + pCreature = ObjectAccessor::GetCreature(*handler->GetSession()->GetPlayer(), MAKE_GUID(lowguid, HIGHGUID_UNIT)); */ // attempt check creature existence by DB data @@ -821,11 +821,11 @@ public: } if (doNotDelete == false) { - handler->PSendSysMessage(LANG_MOVE_TYPE_SET,type_str); + handler->PSendSysMessage(LANG_MOVE_TYPE_SET, type_str); } else { - handler->PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL,type_str); + handler->PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL, type_str); } return true; @@ -854,7 +854,7 @@ public: return false; } - pCreature->SetPhaseMask(phasemask,true); + pCreature->SetPhaseMask(phasemask, true); if (!pCreature->isPet()) pCreature->SaveToDB(); @@ -896,8 +896,8 @@ public: pCreature->Respawn(); } - WorldDatabase.PExecute("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u",option,mtype,u_guidlow); - handler->PSendSysMessage(LANG_COMMAND_SPAWNDIST,option); + WorldDatabase.PExecute("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u", option, mtype, u_guidlow); + handler->PSendSysMessage(LANG_COMMAND_SPAWNDIST, option); return true; } @@ -929,9 +929,9 @@ public: else return false; - WorldDatabase.PExecute("UPDATE creature SET spawntimesecs=%i WHERE guid=%u",i_stime,u_guidlow); + WorldDatabase.PExecute("UPDATE creature SET spawntimesecs=%i WHERE guid=%u", i_stime, u_guidlow); pCreature->SetRespawnDelay((uint32)i_stime); - handler->PSendSysMessage(LANG_COMMAND_SPAWNTIME,i_stime); + handler->PSendSysMessage(LANG_COMMAND_SPAWNTIME, i_stime); return true; } @@ -1044,7 +1044,7 @@ public: if (handler->HasLowerSecurity(sObjectMgr->GetPlayer(receiver_guid), 0)) return false; - pCreature->MonsterWhisper(text,receiver_guid); + pCreature->MonsterWhisper(text, receiver_guid); return true; } @@ -1114,7 +1114,7 @@ public: if (!cInfo->isTameable (player->CanTameExoticPets())) { - handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); + handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); return false; } @@ -1123,15 +1123,15 @@ public: Pet* pet = player->CreateTamedPetFrom (creatureTarget); if (!pet) { - handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); + handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry); handler->SetSentErrorMessage (true); return false; } // place pet before player - float x,y,z; - player->GetClosePoint (x,y,z,creatureTarget->GetObjectSize (),CONTACT_DISTANCE); - pet->Relocate (x,y,z,M_PI-player->GetOrientation ()); + float x, y, z; + player->GetClosePoint (x, y, z, creatureTarget->GetObjectSize (), CONTACT_DISTANCE); + pet->Relocate (x, y, z, M_PI-player->GetOrientation ()); // set pet to defensive mode by default (some classes can't control controlled pets in fact). pet->SetReactState(REACT_DEFENSIVE); @@ -1218,14 +1218,14 @@ public: group_member = new FormationInfo; group_member->follow_angle = (pCreature->GetAngle(chr) - chr->GetOrientation()) * 180 / M_PI; - group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2))); + group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(), int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(), int(2))); group_member->leaderGUID = leaderGUID; group_member->groupAI = 0; CreatureGroupMap[lowguid] = group_member; pCreature->SearchFormation(); - WorldDatabase.PExecute("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u','%u','%f', '%f', '%u')", + WorldDatabase.PExecute("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u', '%u', '%f', '%f', '%u')", leaderGUID, lowguid, group_member->follow_dist, group_member->follow_angle, group_member->groupAI); handler->PSendSysMessage("Creature %u added to formation with leader %u", lowguid, leaderGUID); @@ -1319,17 +1319,17 @@ public: added = true; break; default: - handler->PSendSysMessage(LANG_ITEM_SLOT_NOT_EXIST,SlotID); + handler->PSendSysMessage(LANG_ITEM_SLOT_NOT_EXIST, SlotID); added = false; break; } if (added) - handler->PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT,ItemID,tmpItem->Name1,SlotID); + handler->PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT, ItemID, tmpItem->Name1, SlotID); } else { - handler->PSendSysMessage(LANG_ITEM_NOT_FOUND,ItemID); + handler->PSendSysMessage(LANG_ITEM_NOT_FOUND, ItemID); return true; } */ @@ -1420,7 +1420,7 @@ public: return true; } - uint32 idname = sObjectMgr->AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID)); + uint32 idname = sObjectMgr->AddCreatureSubName(pCreature->GetName(), args, pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID)); pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname); pCreature->SaveToDB(); diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 9538221c3ba..381860e5f53 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -60,7 +60,7 @@ public: // .addquest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -70,7 +70,7 @@ public: if (!pQuest) { - handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND,entry); + handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); handler->SetSentErrorMessage(true); return false; } @@ -110,7 +110,7 @@ public: // .removequest #entry' // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -131,7 +131,7 @@ public: uint32 quest = player->GetQuestSlotQuestId(slot); if (quest == entry) { - player->SetQuestSlot(slot,0); + player->SetQuestSlot(slot, 0); // we ignore unequippable quest items in this case, its' still be equipped player->TakeQuestSourceItem(quest, false); @@ -157,7 +157,7 @@ public: // .quest complete #entry // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r - char* cId = handler->extractKeyFromLink((char*)args,"Hquest"); + char* cId = handler->extractKeyFromLink((char*)args, "Hquest"); if (!cId) return false; @@ -181,14 +181,14 @@ public: if (!id || !count) continue; - uint32 curItemCount = player->GetItemCount(id,true); + uint32 curItemCount = player->GetItemCount(id, true); ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, id, count-curItemCount); if (msg == EQUIP_ERR_OK) { Item* item = player->StoreNewItem(dest, id, true); - player->SendNewItem(item,count-curItemCount,true,false); + player->SendNewItem(item, count-curItemCount, true, false); } } @@ -201,18 +201,18 @@ public: if (uint32 spell_id = pQuest->ReqSpell[i]) { for (uint16 z = 0; z < creaturecount; ++z) - player->CastedCreatureOrGO(creature,0,spell_id); + player->CastedCreatureOrGO(creature, 0, spell_id); } else if (creature > 0) { if (CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(creature)) for (uint16 z = 0; z < creaturecount; ++z) - player->KilledMonster(cInfo,0); + player->KilledMonster(cInfo, 0); } else if (creature < 0) { for (uint16 z = 0; z < creaturecount; ++z) - player->CastedCreatureOrGO(creature,0,0); + player->CastedCreatureOrGO(creature, 0, 0); } } @@ -223,7 +223,7 @@ public: uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue) if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) - player->GetReputationMgr().SetReputation(factionEntry,repValue); + player->GetReputationMgr().SetReputation(factionEntry, repValue); } // If the quest requires a SECOND reputation to complete @@ -233,7 +233,7 @@ public: uint32 curRep = player->GetReputationMgr().GetReputation(repFaction); if (curRep < repValue2) if (FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction)) - player->GetReputationMgr().SetReputation(factionEntry,repValue2); + player->GetReputationMgr().SetReputation(factionEntry, repValue2); } // If the quest requires money diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 9fed2a2167a..44baf909a16 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -46,7 +46,7 @@ public: { static ChatCommand reloadAllCommandTable[] = { - { "achievement",SEC_ADMINISTRATOR, true, &HandleReloadAllAchievementCommand,"", NULL }, + { "achievement", SEC_ADMINISTRATOR, true, &HandleReloadAllAchievementCommand, "", NULL }, { "area", SEC_ADMINISTRATOR, true, &HandleReloadAllAreaCommand, "", NULL }, { "eventai", SEC_ADMINISTRATOR, true, &HandleReloadAllEventAICommand, "", NULL }, { "gossips", SEC_ADMINISTRATOR, true, &HandleReloadAllGossipsCommand, "", NULL }, @@ -78,7 +78,7 @@ public: { "creature_ai_scripts", SEC_ADMINISTRATOR, true, &HandleReloadEventAIScriptsCommand, "", NULL }, { "creature_ai_summons", SEC_ADMINISTRATOR, true, &HandleReloadEventAISummonsCommand, "", NULL }, { "creature_ai_texts", SEC_ADMINISTRATOR, true, &HandleReloadEventAITextsCommand, "", NULL }, - { "creature_involvedrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestInvRelationsCommand, "",NULL }, + { "creature_involvedrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestInvRelationsCommand, "", NULL }, { "creature_linked_respawn", SEC_GAMEMASTER, true, &HandleReloadLinkedRespawnCommand, "", NULL }, { "creature_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesCreatureCommand, "", NULL }, { "creature_onkill_reputation", SEC_ADMINISTRATOR, true, &HandleReloadOnKillReputationCommand, "", NULL }, @@ -116,11 +116,11 @@ public: { "mail_level_reward", SEC_ADMINISTRATOR, true, &HandleReloadMailLevelRewardCommand, "", NULL }, { "mail_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesMailCommand, "", NULL }, { "milling_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesMillingCommand, "", NULL }, - { "npc_spellclick_spells", SEC_ADMINISTRATOR, true, &HandleReloadSpellClickSpellsCommand, "",NULL}, + { "npc_spellclick_spells", SEC_ADMINISTRATOR, true, &HandleReloadSpellClickSpellsCommand, "", NULL}, { "npc_trainer", SEC_ADMINISTRATOR, true, &HandleReloadNpcTrainerCommand, "", NULL }, { "npc_vendor", SEC_ADMINISTRATOR, true, &HandleReloadNpcVendorCommand, "", NULL }, { "page_text", SEC_ADMINISTRATOR, true, &HandleReloadPageTextsCommand, "", NULL }, - { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesPickpocketingCommand, "",NULL}, + { "pickpocketing_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesPickpocketingCommand, "", NULL}, { "points_of_interest", SEC_ADMINISTRATOR, true, &HandleReloadPointsOfInterestCommand, "", NULL }, { "prospecting_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesProspectingCommand, "", NULL }, { "quest_end_scripts", SEC_ADMINISTRATOR, true, &HandleReloadQuestEndScriptsCommand, "", NULL }, @@ -130,7 +130,7 @@ public: { "reference_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesReferenceCommand, "", NULL }, { "reserved_name", SEC_ADMINISTRATOR, true, &HandleReloadReservedNameCommand, "", NULL }, { "reputation_reward_rate", SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, - { "reputation_spillover_template",SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, + { "reputation_spillover_template", SEC_ADMINISTRATOR, true, &HandleReloadReputationRewardRateCommand, "", NULL }, { "skill_discovery_template", SEC_ADMINISTRATOR, true, &HandleReloadSkillDiscoveryTemplateCommand, "", NULL }, { "skill_extra_item_template", SEC_ADMINISTRATOR, true, &HandleReloadSkillExtraItemTemplateCommand, "", NULL }, { "skill_fishing_base_level", SEC_ADMINISTRATOR, true, &HandleReloadSkillFishingBaseLevelCommand, "", NULL }, @@ -172,46 +172,46 @@ public: static bool HandleReloadAllCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadSkillFishingBaseLevelCommand(handler,""); - - HandleReloadAllAchievementCommand(handler,""); - HandleReloadAllAreaCommand(handler,""); - HandleReloadAllEventAICommand(handler,""); - HandleReloadAllLootCommand(handler,""); - HandleReloadAllNpcCommand(handler,""); - HandleReloadAllQuestCommand(handler,""); - HandleReloadAllSpellCommand(handler,""); - HandleReloadAllItemCommand(handler,""); - HandleReloadAllGossipsCommand(handler,""); - HandleReloadAllLocalesCommand(handler,""); - - HandleReloadAccessRequirementCommand(handler,""); - HandleReloadMailLevelRewardCommand(handler,""); - HandleReloadCommandCommand(handler,""); - HandleReloadReservedNameCommand(handler,""); - HandleReloadTrinityStringCommand(handler,""); - HandleReloadGameTeleCommand(handler,""); + HandleReloadSkillFishingBaseLevelCommand(handler, ""); + + HandleReloadAllAchievementCommand(handler, ""); + HandleReloadAllAreaCommand(handler, ""); + HandleReloadAllEventAICommand(handler, ""); + HandleReloadAllLootCommand(handler, ""); + HandleReloadAllNpcCommand(handler, ""); + HandleReloadAllQuestCommand(handler, ""); + HandleReloadAllSpellCommand(handler, ""); + HandleReloadAllItemCommand(handler, ""); + HandleReloadAllGossipsCommand(handler, ""); + HandleReloadAllLocalesCommand(handler, ""); + + HandleReloadAccessRequirementCommand(handler, ""); + HandleReloadMailLevelRewardCommand(handler, ""); + HandleReloadCommandCommand(handler, ""); + HandleReloadReservedNameCommand(handler, ""); + HandleReloadTrinityStringCommand(handler, ""); + HandleReloadGameTeleCommand(handler, ""); HandleReloadVehicleAccessoryCommand(handler, ""); HandleReloadVehicleTemplateAccessoryCommand(handler, ""); - HandleReloadAutobroadcastCommand(handler,""); + HandleReloadAutobroadcastCommand(handler, ""); return true; } static bool HandleReloadAllAchievementCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadAchievementCriteriaDataCommand(handler,""); - HandleReloadAchievementRewardCommand(handler,""); + HandleReloadAchievementCriteriaDataCommand(handler, ""); + HandleReloadAchievementRewardCommand(handler, ""); return true; } static bool HandleReloadAllAreaCommand(ChatHandler* handler, const char* /*args*/) { - //HandleReloadQuestAreaTriggersCommand(handler,""); -- reloaded in HandleReloadAllQuestCommand - HandleReloadAreaTriggerTeleportCommand(handler,""); - HandleReloadAreaTriggerTavernCommand(handler,""); - HandleReloadGameGraveyardZoneCommand(handler,""); + //HandleReloadQuestAreaTriggersCommand(handler, ""); -- reloaded in HandleReloadAllQuestCommand + HandleReloadAreaTriggerTeleportCommand(handler, ""); + HandleReloadAreaTriggerTavernCommand(handler, ""); + HandleReloadGameGraveyardZoneCommand(handler, ""); return true; } @@ -227,18 +227,18 @@ public: static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) { if(*args != 'a') // will be reloaded from all_gossips - HandleReloadNpcTrainerCommand(handler,"a"); - HandleReloadNpcVendorCommand(handler,"a"); - HandleReloadPointsOfInterestCommand(handler,"a"); - HandleReloadSpellClickSpellsCommand(handler,"a"); + HandleReloadNpcTrainerCommand(handler, "a"); + HandleReloadNpcVendorCommand(handler, "a"); + HandleReloadPointsOfInterestCommand(handler, "a"); + HandleReloadSpellClickSpellsCommand(handler, "a"); return true; } static bool HandleReloadAllQuestCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadQuestAreaTriggersCommand(handler,"a"); - HandleReloadQuestPOICommand(handler,"a"); - HandleReloadQuestTemplateCommand(handler,"a"); + HandleReloadQuestAreaTriggersCommand(handler, "a"); + HandleReloadQuestPOICommand(handler, "a"); + HandleReloadQuestTemplateCommand(handler, "a"); sLog->outString("Re-Loading Quests Relations..."); sObjectMgr->LoadQuestRelations(); @@ -256,72 +256,72 @@ public: } sLog->outString("Re-Loading Scripts..."); - HandleReloadGameObjectScriptsCommand(handler,"a"); - HandleReloadGossipScriptsCommand(handler,"a"); - HandleReloadEventScriptsCommand(handler,"a"); - HandleReloadQuestEndScriptsCommand(handler,"a"); - HandleReloadQuestStartScriptsCommand(handler,"a"); - HandleReloadSpellScriptsCommand(handler,"a"); + HandleReloadGameObjectScriptsCommand(handler, "a"); + HandleReloadGossipScriptsCommand(handler, "a"); + HandleReloadEventScriptsCommand(handler, "a"); + HandleReloadQuestEndScriptsCommand(handler, "a"); + HandleReloadQuestStartScriptsCommand(handler, "a"); + HandleReloadSpellScriptsCommand(handler, "a"); handler->SendGlobalGMSysMessage("DB tables `*_scripts` reloaded."); - HandleReloadDbScriptStringCommand(handler,"a"); - HandleReloadWpScriptsCommand(handler,"a"); + HandleReloadDbScriptStringCommand(handler, "a"); + HandleReloadWpScriptsCommand(handler, "a"); return true; } static bool HandleReloadAllEventAICommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadEventAITextsCommand(handler,"a"); - HandleReloadEventAISummonsCommand(handler,"a"); - HandleReloadEventAIScriptsCommand(handler,"a"); + HandleReloadEventAITextsCommand(handler, "a"); + HandleReloadEventAISummonsCommand(handler, "a"); + HandleReloadEventAIScriptsCommand(handler, "a"); return true; } static bool HandleReloadAllSpellCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadSkillDiscoveryTemplateCommand(handler,"a"); - HandleReloadSkillExtraItemTemplateCommand(handler,"a"); - HandleReloadSpellRequiredCommand(handler,"a"); - HandleReloadSpellAreaCommand(handler,"a"); - HandleReloadSpellGroupsCommand(handler,"a"); - HandleReloadSpellLearnSpellCommand(handler,"a"); - HandleReloadSpellLinkedSpellCommand(handler,"a"); - HandleReloadSpellProcEventCommand(handler,"a"); - HandleReloadSpellBonusesCommand(handler,"a"); - HandleReloadSpellTargetPositionCommand(handler,"a"); - HandleReloadSpellThreatsCommand(handler,"a"); - HandleReloadSpellGroupStackRulesCommand(handler,"a"); - HandleReloadSpellPetAurasCommand(handler,"a"); + HandleReloadSkillDiscoveryTemplateCommand(handler, "a"); + HandleReloadSkillExtraItemTemplateCommand(handler, "a"); + HandleReloadSpellRequiredCommand(handler, "a"); + HandleReloadSpellAreaCommand(handler, "a"); + HandleReloadSpellGroupsCommand(handler, "a"); + HandleReloadSpellLearnSpellCommand(handler, "a"); + HandleReloadSpellLinkedSpellCommand(handler, "a"); + HandleReloadSpellProcEventCommand(handler, "a"); + HandleReloadSpellBonusesCommand(handler, "a"); + HandleReloadSpellTargetPositionCommand(handler, "a"); + HandleReloadSpellThreatsCommand(handler, "a"); + HandleReloadSpellGroupStackRulesCommand(handler, "a"); + HandleReloadSpellPetAurasCommand(handler, "a"); return true; } static bool HandleReloadAllGossipsCommand(ChatHandler* handler, const char* args) { - HandleReloadGossipMenuCommand(handler,"a"); - HandleReloadGossipMenuOptionCommand(handler,"a"); + HandleReloadGossipMenuCommand(handler, "a"); + HandleReloadGossipMenuOptionCommand(handler, "a"); if(*args != 'a') // already reload from all_scripts - HandleReloadGossipScriptsCommand(handler,"a"); - HandleReloadPointsOfInterestCommand(handler,"a"); + HandleReloadGossipScriptsCommand(handler, "a"); + HandleReloadPointsOfInterestCommand(handler, "a"); return true; } static bool HandleReloadAllItemCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadPageTextsCommand(handler,"a"); - HandleReloadItemEnchantementsCommand(handler,"a"); + HandleReloadPageTextsCommand(handler, "a"); + HandleReloadItemEnchantementsCommand(handler, "a"); return true; } static bool HandleReloadAllLocalesCommand(ChatHandler* handler, const char* /*args*/) { - HandleReloadLocalesAchievementRewardCommand(handler,"a"); - HandleReloadLocalesCreatureCommand(handler,"a"); - HandleReloadLocalesGameobjectCommand(handler,"a"); - HandleReloadLocalesGossipMenuOptionCommand(handler,"a"); - HandleReloadLocalesItemCommand(handler,"a"); - HandleReloadLocalesNpcTextCommand(handler,"a"); - HandleReloadLocalesPageTextCommand(handler,"a"); - HandleReloadLocalesPointsOfInterestCommand(handler,"a"); - HandleReloadLocalesQuestCommand(handler,"a"); + HandleReloadLocalesAchievementRewardCommand(handler, "a"); + HandleReloadLocalesCreatureCommand(handler, "a"); + HandleReloadLocalesGameobjectCommand(handler, "a"); + HandleReloadLocalesGossipMenuOptionCommand(handler, "a"); + HandleReloadLocalesItemCommand(handler, "a"); + HandleReloadLocalesNpcTextCommand(handler, "a"); + HandleReloadLocalesPageTextCommand(handler, "a"); + HandleReloadLocalesPointsOfInterestCommand(handler, "a"); + HandleReloadLocalesQuestCommand(handler, "a"); return true; } @@ -403,7 +403,7 @@ public: return false; uint32 entry = (uint32) atoi((char*)args); - QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1,difficulty_entry_2,difficulty_entry_3,KillCredit1,KillCredit2,modelid1,modelid2,modelid3,modelid4,name,subname,IconName,gossip_menu_id,minlevel,maxlevel,exp,faction_A,faction_H,npcflag,speed_walk,speed_run,scale,rank,mindmg,maxdmg,dmgschool,attackpower,dmg_multiplier,baseattacktime,rangeattacktime,unit_class,unit_flags,dynamicflags,family,trainer_type,trainer_spell,trainer_class,trainer_race,minrangedmg,maxrangedmg,rangedattackpower,type,type_flags,lootid,pickpocketloot,skinloot,resistance1,resistance2,resistance3,resistance4,resistance5,resistance6,spell1,spell2,spell3,spell4,spell5,spell6,spell7,spell8,PetSpellDataId,VehicleId,mingold,maxgold,AIName,MovementType,InhabitType,Health_mod,Mana_mod,Armor_mod,RacialLeader,questItem1,questItem2,questItem3,questItem4,questItem5,questItem6,movementId,RegenHealth,equipment_id,mechanic_immune_mask,flags_extra,ScriptName FROM creature_template WHERE entry = %u", entry); + QueryResult result = WorldDatabase.PQuery("SELECT difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, modelid1, modelid2, modelid3, modelid4, name, subname, IconName, gossip_menu_id, minlevel, maxlevel, exp, faction_A, faction_H, npcflag, speed_walk, speed_run, scale, rank, mindmg, maxdmg, dmgschool, attackpower, dmg_multiplier, baseattacktime, rangeattacktime, unit_class, unit_flags, dynamicflags, family, trainer_type, trainer_spell, trainer_class, trainer_race, minrangedmg, maxrangedmg, rangedattackpower, type, type_flags, lootid, pickpocketloot, skinloot, resistance1, resistance2, resistance3, resistance4, resistance5, resistance6, spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, InhabitType, Health_mod, Mana_mod, Armor_mod, RacialLeader, questItem1, questItem2, questItem3, questItem4, questItem5, questItem6, movementId, RegenHealth, equipment_id, mechanic_immune_mask, flags_extra, ScriptName FROM creature_template WHERE entry = %u", entry); if (!result) { handler->PSendSysMessage(LANG_COMMAND_CREATURETEMPLATE_NOTFOUND, entry); diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 8925ba0d250..eac6d29651b 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -115,14 +115,14 @@ public: { char* nameStr; char* teleStr; - handler->extractOptFirstArg((char*)args,&nameStr,&teleStr); + handler->extractOptFirstArg((char*)args, &nameStr, &teleStr); if (!teleStr) return false; Player* target; uint64 target_guid; std::string target_name; - if (!handler->extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!handler->extractPlayerTarget(nameStr, &target, &target_guid, &target_name)) return false; // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r @@ -149,7 +149,7 @@ public: return false; } - handler->PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(),"", tele->name.c_str()); + handler->PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(), "", tele->name.c_str()); if (handler->needReportToTarget(target)) (ChatHandler(target)).PSendSysMessage(LANG_TELEPORTED_TO_BY, handler->GetNameLink().c_str()); @@ -163,7 +163,7 @@ public: else target->SaveRecallPosition(); - target->TeleportTo(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation); + target->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation); } else { @@ -174,8 +174,8 @@ public: std::string nameLink = handler->playerLink(target_name); handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE), tele->name.c_str()); - Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation, - sMapMgr->GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid); + Player::SavePositionInDB(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation, + sMapMgr->GetZoneId(tele->mapId, tele->position_x, tele->position_y, tele->position_z), target_guid); } return true; @@ -221,7 +221,7 @@ public: Group *grp = player->GetGroup(); if (!grp) { - handler->PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str()); + handler->PSendSysMessage(LANG_NOT_IN_GROUP, nameLink.c_str()); handler->SetSentErrorMessage(true); return false; } @@ -245,7 +245,7 @@ public: continue; } - handler->PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(),"", tele->name.c_str()); + handler->PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(), "", tele->name.c_str()); if (handler->needReportToTarget(pl)) (ChatHandler(pl)).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str()); diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 644023f9ac1..b96b656e7d8 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -57,7 +57,7 @@ public: static bool HandleTitlesCurrentCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -92,7 +92,7 @@ public: std::string tNameLink = handler->GetNameLink(target); target->SetTitle(titleInfo); // to be sure that title now known - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,titleInfo->bit_index); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->bit_index); handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, titleInfo->name[handler->GetSessionDbcLocale()], tNameLink.c_str()); @@ -102,7 +102,7 @@ public: static bool HandleTitlesAddCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -138,7 +138,7 @@ public: char const* targetName = target->GetName(); char titleNameStr[80]; - snprintf(titleNameStr,80,titleInfo->name[handler->GetSessionDbcLocale()],targetName); + snprintf(titleNameStr, 80, titleInfo->name[handler->GetSessionDbcLocale()], targetName); target->SetTitle(titleInfo); handler->PSendSysMessage(LANG_TITLE_ADD_RES, id, titleNameStr, tNameLink.c_str()); @@ -149,7 +149,7 @@ public: static bool HandleTitlesRemoveCommand(ChatHandler* handler, const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = handler->extractKeyFromLink((char*)args,"Htitle"); + char* id_p = handler->extractKeyFromLink((char*)args, "Htitle"); if (!id_p) return false; @@ -181,19 +181,19 @@ public: return false; } - target->SetTitle(titleInfo,true); + target->SetTitle(titleInfo, true); std::string tNameLink = handler->GetNameLink(target); char const* targetName = target->GetName(); char titleNameStr[80]; - snprintf(titleNameStr,80,titleInfo->name[handler->GetSessionDbcLocale()],targetName); + snprintf(titleNameStr, 80, titleInfo->name[handler->GetSessionDbcLocale()], targetName); handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, id, titleNameStr, tNameLink.c_str()); if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE))) { - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0); handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET, tNameLink.c_str()); } @@ -235,8 +235,8 @@ public: if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE))) { - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0); - handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET,handler->GetNameLink(target).c_str()); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0); + handler->PSendSysMessage(LANG_CURRENT_TITLE_RESET, handler->GetNameLink(target).c_str()); } return true; diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index fcb15b4b6f3..12475f8d218 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -109,7 +109,7 @@ public: return true; } - QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'", pathid); if (result) point = (*result)[0].GetUInt32(); @@ -117,10 +117,10 @@ public: Player* player = handler->GetSession()->GetPlayer(); //Map *map = player->GetMap(); - WorldDatabase.PExecute("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u','%u','%f', '%f', '%f')", + WorldDatabase.PExecute("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u', '%u', '%f', '%f', '%f')", pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); - handler->PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point+1,"|r|cff00ff00 created. "); + handler->PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point+1, "|r|cff00ff00 created. "); return true; } // HandleWpAddCommand @@ -166,19 +166,19 @@ public: } guidlow = target->GetDBTableGUIDLow(); - QueryResult result = WorldDatabase.PQuery("SELECT guid FROM creature_addon WHERE guid = '%u'",guidlow); + QueryResult result = WorldDatabase.PQuery("SELECT guid FROM creature_addon WHERE guid = '%u'", guidlow); if (result) WorldDatabase.PExecute("UPDATE creature_addon SET path_id = '%u' WHERE guid = '%u'", pathid, guidlow); else - WorldDatabase.PExecute("INSERT INTO creature_addon(guid,path_id) VALUES ('%u','%u')", guidlow, pathid); + WorldDatabase.PExecute("INSERT INTO creature_addon(guid, path_id) VALUES ('%u', '%u')", guidlow, pathid); WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, guidlow); target->LoadPath(pathid); target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); target->GetMotionMaster()->Initialize(); - target->MonsterSay("Path loaded.",0,0); + target->MonsterSay("Path loaded.", 0, 0); return true; } @@ -219,7 +219,7 @@ public: target->SetDefaultMovementType(IDLE_MOTION_TYPE); target->GetMotionMaster()->MoveTargetedHome(); target->GetMotionMaster()->Initialize(); - target->MonsterSay("Path unloaded.",0,0); + target->MonsterSay("Path unloaded.", 0, 0); return true; } handler->PSendSysMessage("%s%s|r", "|cffff33ff", "Target have no loaded path."); @@ -263,7 +263,7 @@ public: QueryResult result = WorldDatabase.Query("SELECT MAX(guid) FROM waypoint_scripts"); id = result->Fetch()->GetUInt32(); WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id+1); - handler->PSendSysMessage("%s%s%u|r", "|cff00ff00","Wp Event: New waypoint event added: |r|cff00ffff", id+1); + handler->PSendSysMessage("%s%s%u|r", "|cff00ff00", "Wp Event: New waypoint event added: |r|cff00ffff", id+1); } return true; @@ -273,7 +273,7 @@ public: { if (!arg_id) { - handler->PSendSysMessage("%s%s|r", "|cff33ffff","Wp Event: You must provide waypoint script id."); + handler->PSendSysMessage("%s%s|r", "|cff33ffff", "Wp Event: You must provide waypoint script id."); return true; } @@ -321,7 +321,7 @@ public: if (result) { WorldDatabase.PExecute("DELETE FROM waypoint_scripts WHERE guid = %u", id); - handler->PSendSysMessage("%s%s%u|r","|cff00ff00","Wp Event: Waypoint script removed: ", id); + handler->PSendSysMessage("%s%s%u|r", "|cff00ff00", "Wp Event: Waypoint script removed: ", id); } else handler->PSendSysMessage("|cffff33ffWp Event: ERROR: you have selected a non existing script: %u|r", id); @@ -345,7 +345,7 @@ public: return true; } - char* arg_2 = strtok(NULL," "); + char* arg_2 = strtok(NULL, " "); if (!arg_2) { @@ -365,7 +365,7 @@ public: char* arg_3; std::string arg_str_2 = arg_2; - arg_3 = strtok(NULL," "); + arg_3 = strtok(NULL, " "); if (!arg_3) { @@ -378,13 +378,13 @@ public: if (arg_str_2 == "setid") { uint32 newid = atoi(arg_3); - handler->PSendSysMessage("%s%s|r|cff00ffff%u|r|cff00ff00%s|r|cff00ffff%u|r","|cff00ff00","Wp Event: Wypoint scipt guid: ", newid," id changed: ", id); + handler->PSendSysMessage("%s%s|r|cff00ffff%u|r|cff00ff00%s|r|cff00ffff%u|r", "|cff00ff00", "Wp Event: Wypoint scipt guid: ", newid, " id changed: ", id); WorldDatabase.PExecute("UPDATE waypoint_scripts SET id='%u' WHERE guid='%u'", newid, id); return true; } else { - QueryResult result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'",id); + QueryResult result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'", id); if (!result) { @@ -439,7 +439,7 @@ public: arg_2, arg_str_3.c_str(), id); } } - handler->PSendSysMessage("%s%s|r|cff00ffff%u:|r|cff00ff00 %s %s|r","|cff00ff00","Waypoint script:", id, arg_2,"updated."); + handler->PSendSysMessage("%s%s|r|cff00ffff%u:|r|cff00ff00 %s %s|r", "|cff00ff00", "Waypoint script:", id, arg_2, "updated."); } return true; } @@ -599,7 +599,7 @@ public: //sMapMgr->GetMap(npcCreature->GetMapId())->Add(wpCreature2); } - WorldDatabase.PExecute("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'", + WorldDatabase.PExecute("UPDATE waypoint_data SET position_x = '%f', position_y = '%f', position_z = '%f' where id = '%u' AND point='%u'", chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), pathid, point); handler->PSendSysMessage(LANG_WAYPOINT_CHANGED); @@ -719,7 +719,7 @@ public: if (show == "on") { - QueryResult result = WorldDatabase.PQuery("SELECT point, position_x,position_y,position_z FROM waypoint_data WHERE id = '%u'", pathid); + QueryResult result = WorldDatabase.PQuery("SELECT point, position_x, position_y, position_z FROM waypoint_data WHERE id = '%u'", pathid); if (!result) { @@ -740,7 +740,7 @@ public: { Field *fields = result2->Fetch(); uint32 wpguid = fields[0].GetUInt32(); - Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); + Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); if (!pCreature) { @@ -793,7 +793,7 @@ public: wpCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn()); // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); - wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(),map); + wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(), map); map->Add(wpCreature); if (target) @@ -813,7 +813,7 @@ public: { handler->PSendSysMessage("|cff00ff00DEBUG: wp first, GUID: %u|r", pathid); - QueryResult result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM waypoint_data WHERE point='1' AND id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z FROM waypoint_data WHERE point='1' AND id = '%u'", pathid); if (!result) { handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUND, pathid); @@ -832,7 +832,7 @@ public: Map *map = chr->GetMap(); Creature* pCreature = new Creature; - if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) + if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o)) { handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id); delete pCreature; @@ -856,13 +856,13 @@ public: { handler->PSendSysMessage("|cff00ff00DEBUG: wp last, PathID: |r|cff00ffff%u|r", pathid); - QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); + QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'", pathid); if (result) Maxpoint = (*result)[0].GetUInt32(); else Maxpoint = 0; - result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM waypoint_data WHERE point ='%u' AND id = '%u'",Maxpoint, pathid); + result = WorldDatabase.PQuery("SELECT position_x, position_y, position_z FROM waypoint_data WHERE point ='%u' AND id = '%u'", Maxpoint, pathid); if (!result) { handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUNDLAST, pathid); @@ -914,7 +914,7 @@ public: { Field *fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); - Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(guid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); + Creature* pCreature = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(guid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); if (!pCreature) { handler->PSendSysMessage(LANG_WAYPOINT_NOTREMOVED, guid); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index a249c31df28..261c15d3cca 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -72,12 +72,12 @@ class mob_av_marshal_or_warmaster : public CreatureScript void Reset() { - uiChargeTimer = urand(2*IN_MILLISECONDS,12*IN_MILLISECONDS); - uiCleaveTimer = urand(1*IN_MILLISECONDS,11*IN_MILLISECONDS); - uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS,2*IN_MILLISECONDS); - uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,12*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiEnrageTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiChargeTimer = urand(2*IN_MILLISECONDS, 12*IN_MILLISECONDS); + uiCleaveTimer = urand(1*IN_MILLISECONDS, 11*IN_MILLISECONDS); + uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS, 2*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(1*IN_MILLISECONDS, 12*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiEnrageTimer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiResetTimer = 5*IN_MILLISECONDS; bHasAura = false; @@ -95,28 +95,28 @@ class mob_av_marshal_or_warmaster : public CreatureScript switch(me->GetEntry()) { case NPC_NORTH_MARSHAL: - DoCast(me,SPELL_NORTH_MARSHAL); + DoCast(me, SPELL_NORTH_MARSHAL); break; case NPC_SOUTH_MARSHAL: - DoCast(me,SPELL_SOUTH_MARSHAL); + DoCast(me, SPELL_SOUTH_MARSHAL); break; case NPC_STONEHEARTH_MARSHAL: - DoCast(me,SPELL_STONEHEARTH_MARSHAL); + DoCast(me, SPELL_STONEHEARTH_MARSHAL); break; case NPC_ICEWING_MARSHAL: - DoCast(me,SPELL_ICEWING_MARSHAL); + DoCast(me, SPELL_ICEWING_MARSHAL); break; case NPC_EAST_FROSTWOLF_WARMASTER: - DoCast(me,SPELL_EAST_FROSTWOLF_WARMASTER); + DoCast(me, SPELL_EAST_FROSTWOLF_WARMASTER); break; case NPC_WEST_FROSTWOLF_WARMASTER: - DoCast(me,SPELL_WEST_FROSTWOLF_WARMASTER); + DoCast(me, SPELL_WEST_FROSTWOLF_WARMASTER); break; case NPC_ICEBLOOD_WARMASTER: - DoCast(me,SPELL_ICEBLOOD_WARMASTER); + DoCast(me, SPELL_ICEBLOOD_WARMASTER); break; case NPC_TOWER_POINT_WARMASTER: - DoCast(me,SPELL_TOWER_POINT_WARMASTER); + DoCast(me, SPELL_TOWER_POINT_WARMASTER); break; } @@ -129,37 +129,37 @@ class mob_av_marshal_or_warmaster : public CreatureScript if (uiChargeTimer <= diff) { DoCast(me->getVictim(), SPELL_CHARGE); - uiChargeTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiChargeTimer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiChargeTimer -= diff; if (uiCleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - uiCleaveTimer = urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS); + uiCleaveTimer = urand(10*IN_MILLISECONDS, 16*IN_MILLISECONDS); } else uiCleaveTimer -= diff; if (uiDemoralizingShoutTimer <= diff) { DoCast(me->getVictim(), SPELL_DEMORALIZING_SHOUT); - uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiDemoralizingShoutTimer -= diff; if (uiWhirlwind1Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND1); - uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(6*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiWhirlwind1Timer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiEnrageTimer <= diff) { DoCast(me->getVictim(), SPELL_ENRAGE); - uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiEnrageTimer = urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS); }else uiEnrageTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 3219b284c80..c3518115f54 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -110,7 +110,7 @@ public: void Reset() { - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); uiConeOfColdTimer = 8*IN_MILLISECONDS; uiFireBoltTimer = 1*IN_MILLISECONDS; uiFrostboltTimer = 4*IN_MILLISECONDS; @@ -133,7 +133,7 @@ public: void JustSummoned(Creature* summoned) { CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->uiBalindaGUID = me->GetGUID(); - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); summoned->setFaction(me->getFaction()); Summons.Summon(summoned); } @@ -158,25 +158,25 @@ public: if (uiArcaneExplosionTimer < diff) { DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiArcaneExplosionTimer -= diff; if (uiConeOfColdTimer < diff) { DoCast(me->getVictim(), SPELL_CONE_OF_COLD); - uiConeOfColdTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiConeOfColdTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiConeOfColdTimer -= diff; if (uiFireBoltTimer < diff) { DoCast(me->getVictim(), SPELL_FIREBALL); - uiFireBoltTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS); + uiFireBoltTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); } else uiFireBoltTimer -= diff; if (uiFrostboltTimer < diff) { DoCast(me->getVictim(), SPELL_FROSTBOLT); - uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiFrostboltTimer = urand(4*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiFrostboltTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index ad61e43bcd4..2639d2ab5c6 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -59,12 +59,12 @@ public: void Reset() { - uiWhirlwindTimer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiWhirlwindTimer = urand(1*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(1*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiKnockdownTimer = 12*IN_MILLISECONDS; uiFrenzyTimer = 6*IN_MILLISECONDS; uiResetTimer = 5*IN_MILLISECONDS; - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } void EnterCombat(Unit * /*who*/) @@ -86,31 +86,31 @@ public: if (uiWhirlwindTimer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND); - uiWhirlwindTimer = urand(8*IN_MILLISECONDS,18*IN_MILLISECONDS); + uiWhirlwindTimer = urand(8*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiWhirlwindTimer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(7*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiKnockdownTimer <= diff) { DoCast(me->getVictim(), SPELL_KNOCKDOWN); - uiKnockdownTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiKnockdownTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiKnockdownTimer -= diff; if (uiFrenzyTimer <= diff) { DoCast(me->getVictim(), SPELL_FRENZY); - uiFrenzyTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiFrenzyTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiFrenzyTimer -= diff; if (uiYellTimer <= diff) { - DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5), me); - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5), me); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } else uiYellTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 74c0365c041..7014bfde7c4 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -50,11 +50,11 @@ public: void Reset() { - uiCleaveTimer = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiFrighteningShoutTimer = urand(2*IN_MILLISECONDS,19*IN_MILLISECONDS); - uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,13*IN_MILLISECONDS); - uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); - uiMortalStrikeTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiCleaveTimer = urand(1*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiFrighteningShoutTimer = urand(2*IN_MILLISECONDS, 19*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(1*IN_MILLISECONDS, 13*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); + uiMortalStrikeTimer = urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiResetTimer = 5*IN_MILLISECONDS; } @@ -76,31 +76,31 @@ public: if (uiCleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - uiCleaveTimer = urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS); + uiCleaveTimer = urand(10*IN_MILLISECONDS, 16*IN_MILLISECONDS); } else uiCleaveTimer -= diff; if (uiFrighteningShoutTimer <= diff) { DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); - uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiFrighteningShoutTimer -= diff; if (uiWhirlwind1Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND1); - uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiWhirlwind1Timer = urand(6*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else uiWhirlwind1Timer -= diff; if (uiWhirlwind2Timer <= diff) { DoCast(me->getVictim(), SPELL_WHIRLWIND2); - uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiWhirlwind2Timer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiWhirlwind2Timer -= diff; if (uiMortalStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiMortalStrikeTimer = urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiMortalStrikeTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 65b7c39f241..a04cb1b55b5 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -60,7 +60,7 @@ public: uiThunderclapTimer = 4*IN_MILLISECONDS; uiStormboltTimer = 6*IN_MILLISECONDS; uiResetTimer = 5*IN_MILLISECONDS; - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } void EnterCombat(Unit * /*who*/) @@ -71,7 +71,7 @@ public: void JustRespawned() { Reset(); - DoScriptText(RAND(YELL_RESPAWN1,YELL_RESPAWN2), me); + DoScriptText(RAND(YELL_RESPAWN1, YELL_RESPAWN2), me); } void UpdateAI(const uint32 diff) @@ -82,25 +82,25 @@ public: if (uiAvatarTimer <= diff) { DoCast(me->getVictim(), SPELL_AVATAR); - uiAvatarTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiAvatarTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); } else uiAvatarTimer -= diff; if (uiThunderclapTimer <= diff) { DoCast(me->getVictim(), SPELL_THUNDERCLAP); - uiThunderclapTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiThunderclapTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiThunderclapTimer -= diff; if (uiStormboltTimer <= diff) { DoCast(me->getVictim(), SPELL_STORMBOLT); - uiStormboltTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiStormboltTimer = urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiStormboltTimer -= diff; if (uiYellTimer <= diff) { - DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5,YELL_RANDOM6,YELL_RANDOM7), me); - uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds + DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5, YELL_RANDOM6, YELL_RANDOM7), me); + uiYellTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); //20 to 30 seconds } else uiYellTimer -= diff; // check if creature is not outside of building diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index e46ed6c0593..58480e9d4d3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -113,8 +113,8 @@ public: if (pInstance->GetData(TYPE_RING_OF_LAW) == IN_PROGRESS || pInstance->GetData(TYPE_RING_OF_LAW) == DONE) return false; - pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); - pPlayer->SummonCreature(NPC_GRIMSTONE,625.559f,-205.618f,-52.735f,2.609f,TEMPSUMMON_DEAD_DESPAWN,0); + pInstance->SetData(TYPE_RING_OF_LAW, IN_PROGRESS); + pPlayer->SummonCreature(NPC_GRIMSTONE, 625.559f, -205.618f, -52.735f, 2.609f, TEMPSUMMON_DEAD_DESPAWN, 0); return false; } @@ -191,7 +191,7 @@ public: //TODO: move them to center void SummonRingMob() { - if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960f,-235.322f,-53.907f,1.857f,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId], 608.960f, -235.322f, -53.907f, 1.857f, TEMPSUMMON_DEAD_DESPAWN, 0)) RingMobGUID[MobCount] = tmp->GetGUID(); ++MobCount; @@ -203,7 +203,7 @@ public: //TODO: move them to center void SummonRingBoss() { - if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300f,-175.989f,-53.739f,3.418f,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6], 644.300f, -175.989f, -53.739f, 3.418f, TEMPSUMMON_DEAD_DESPAWN, 0)) RingBossGUID = tmp->GetGUID(); MobDeath_Timer = 2500; @@ -238,7 +238,7 @@ public: if (pInstance) { pInstance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me); - pInstance->SetData(TYPE_RING_OF_LAW,DONE); + pInstance->SetData(TYPE_RING_OF_LAW, DONE); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_grimstone: event reached end and set complete."); } break; @@ -263,7 +263,7 @@ public: if (RingBossGUID) { - Creature *boss = Unit::GetCreature(*me,RingBossGUID); + Creature *boss = Unit::GetCreature(*me, RingBossGUID); if (boss && !boss->isAlive() && boss->isDead()) { RingBossGUID = 0; @@ -276,7 +276,7 @@ public: for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i) { - Creature *mob = Unit::GetCreature(*me,RingMobGUID[i]); + Creature *mob = Unit::GetCreature(*me, RingMobGUID[i]); if (mob && !mob->isAlive() && mob->isDead()) { RingMobGUID[i] = 0; @@ -626,9 +626,9 @@ public: { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); - dughal_stormwingAI->AddWaypoint(0, 280.42f,-82.86f, -77.12f,0); - dughal_stormwingAI->AddWaypoint(1, 287.64f,-87.01f, -76.79f,0); - dughal_stormwingAI->AddWaypoint(2, 354.63f,-64.95f, -67.53f,0); + dughal_stormwingAI->AddWaypoint(0, 280.42f, -82.86f, -77.12f, 0); + dughal_stormwingAI->AddWaypoint(1, 287.64f, -87.01f, -76.79f, 0); + dughal_stormwingAI->AddWaypoint(2, 354.63f, -64.95f, -67.53f, 0); return dughal_stormwingAI; } @@ -641,7 +641,7 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); } return true; } @@ -665,12 +665,12 @@ public: switch(i) { case 0:me->Say(SAY_DUGHAL_FREE, LANG_UNIVERSAL, PlayerGUID); break; - case 1:pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + case 1:pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 2: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); break; } } @@ -685,7 +685,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_DUGHAL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED); } } @@ -737,26 +737,26 @@ public: { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); - marshal_windsorAI->AddWaypoint(0, 316.336f,-225.528f, -77.7258f,7000); - marshal_windsorAI->AddWaypoint(1, 316.336f,-225.528f, -77.7258f,2000); - marshal_windsorAI->AddWaypoint(2, 322.96f,-207.13f, -77.87f,0); - marshal_windsorAI->AddWaypoint(3, 281.05f,-172.16f, -75.12f,0); - marshal_windsorAI->AddWaypoint(4, 272.19f,-139.14f, -70.61f,0); - marshal_windsorAI->AddWaypoint(5, 283.62f,-116.09f, -70.21f,0); - marshal_windsorAI->AddWaypoint(6, 296.18f,-94.30f, -74.08f,0); - marshal_windsorAI->AddWaypoint(7, 294.57f,-93.11f, -74.08f,0); - marshal_windsorAI->AddWaypoint(8, 314.31f,-74.31f, -76.09f,0); - marshal_windsorAI->AddWaypoint(9, 360.22f,-62.93f, -66.77f,0); - marshal_windsorAI->AddWaypoint(10, 383.38f,-69.40f, -63.25f,0); - marshal_windsorAI->AddWaypoint(11, 389.99f,-67.86f, -62.57f,0); - marshal_windsorAI->AddWaypoint(12, 400.98f,-72.01f, -62.31f,0); - marshal_windsorAI->AddWaypoint(13, 404.22f,-62.30f, -63.50f,2300); - marshal_windsorAI->AddWaypoint(14, 404.22f,-62.30f, -63.50f,1500); - marshal_windsorAI->AddWaypoint(15, 407.65f,-51.86f, -63.96f,0); - marshal_windsorAI->AddWaypoint(16, 403.61f,-51.71f, -63.92f,1000); - marshal_windsorAI->AddWaypoint(17, 403.61f,-51.71f, -63.92f,2000); - marshal_windsorAI->AddWaypoint(18, 403.61f,-51.71f, -63.92f,1000); - marshal_windsorAI->AddWaypoint(19, 403.61f,-51.71f, -63.92f,0); + marshal_windsorAI->AddWaypoint(0, 316.336f, -225.528f, -77.7258f, 7000); + marshal_windsorAI->AddWaypoint(1, 316.336f, -225.528f, -77.7258f, 2000); + marshal_windsorAI->AddWaypoint(2, 322.96f, -207.13f, -77.87f, 0); + marshal_windsorAI->AddWaypoint(3, 281.05f, -172.16f, -75.12f, 0); + marshal_windsorAI->AddWaypoint(4, 272.19f, -139.14f, -70.61f, 0); + marshal_windsorAI->AddWaypoint(5, 283.62f, -116.09f, -70.21f, 0); + marshal_windsorAI->AddWaypoint(6, 296.18f, -94.30f, -74.08f, 0); + marshal_windsorAI->AddWaypoint(7, 294.57f, -93.11f, -74.08f, 0); + marshal_windsorAI->AddWaypoint(8, 314.31f, -74.31f, -76.09f, 0); + marshal_windsorAI->AddWaypoint(9, 360.22f, -62.93f, -66.77f, 0); + marshal_windsorAI->AddWaypoint(10, 383.38f, -69.40f, -63.25f, 0); + marshal_windsorAI->AddWaypoint(11, 389.99f, -67.86f, -62.57f, 0); + marshal_windsorAI->AddWaypoint(12, 400.98f, -72.01f, -62.31f, 0); + marshal_windsorAI->AddWaypoint(13, 404.22f, -62.30f, -63.50f, 2300); + marshal_windsorAI->AddWaypoint(14, 404.22f, -62.30f, -63.50f, 1500); + marshal_windsorAI->AddWaypoint(15, 407.65f, -51.86f, -63.96f, 0); + marshal_windsorAI->AddWaypoint(16, 403.61f, -51.71f, -63.92f, 1000); + marshal_windsorAI->AddWaypoint(17, 403.61f, -51.71f, -63.92f, 2000); + marshal_windsorAI->AddWaypoint(18, 403.61f, -51.71f, -63.92f, 1000); + marshal_windsorAI->AddWaypoint(19, 403.61f, -51.71f, -63.92f, 0); return marshal_windsorAI; } @@ -768,7 +768,7 @@ public: if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) { CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_IN_PROGRESS); pCreature->setFaction(11); } @@ -806,7 +806,7 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 14: - pInstance->SetData(DATA_GATE_SR,0); + pInstance->SetData(DATA_GATE_SR, 0); me->setFaction(11); break; case 16: @@ -816,13 +816,13 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING);//EMOTE_STATE_WORK break; case 18: - pInstance->SetData(DATA_GATE_SC,0); + pInstance->SetData(DATA_GATE_SC, 0); break; case 19: 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; } @@ -830,7 +830,7 @@ public: void EnterCombat(Unit* who) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->Say(SAY_WINDSOR_AGGRO1, LANG_UNIVERSAL, PlayerGUID); break; case 1: me->Say(SAY_WINDSOR_AGGRO2, LANG_UNIVERSAL, PlayerGUID); break; @@ -842,7 +842,7 @@ public: void JustDied(Unit *slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_FAILED); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) @@ -911,41 +911,41 @@ public: { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); - marshal_reginald_windsorAI->AddWaypoint(0, 403.61f,-52.71f, -63.92f,4000); - marshal_reginald_windsorAI->AddWaypoint(1, 403.61f,-52.71f, -63.92f,4000); - marshal_reginald_windsorAI->AddWaypoint(2, 406.33f,-54.87f, -63.95f,0); - marshal_reginald_windsorAI->AddWaypoint(3, 407.99f,-73.91f, -62.26f,0); - marshal_reginald_windsorAI->AddWaypoint(4, 557.03f,-119.71f, -61.83f,0); - marshal_reginald_windsorAI->AddWaypoint(5, 573.40f,-124.39f, -65.07f,0); - marshal_reginald_windsorAI->AddWaypoint(6, 593.91f,-130.29f, -69.25f,0); - marshal_reginald_windsorAI->AddWaypoint(7, 593.21f,-132.16f, -69.25f,0); - marshal_reginald_windsorAI->AddWaypoint(8, 593.21f,-132.16f, -69.25f,3000); - marshal_reginald_windsorAI->AddWaypoint(9, 622.81f,-135.55f, -71.92f,0); - marshal_reginald_windsorAI->AddWaypoint(10, 634.68f,-151.29f, -70.32f,0); - marshal_reginald_windsorAI->AddWaypoint(11, 635.06f,-153.25f, -70.32f,0); - marshal_reginald_windsorAI->AddWaypoint(12, 635.06f,-153.25f, -70.32f,3000); - marshal_reginald_windsorAI->AddWaypoint(13, 635.06f,-153.25f, -70.32f,1500); - marshal_reginald_windsorAI->AddWaypoint(14, 655.25f,-172.39f, -73.72f,0); - marshal_reginald_windsorAI->AddWaypoint(15, 654.79f,-226.30f, -83.06f,0); - marshal_reginald_windsorAI->AddWaypoint(16, 622.85f,-268.85f, -83.96f,0); - marshal_reginald_windsorAI->AddWaypoint(17, 579.45f,-275.56f, -80.44f,0); - marshal_reginald_windsorAI->AddWaypoint(18, 561.19f,-266.85f, -75.59f,0); - marshal_reginald_windsorAI->AddWaypoint(19, 547.91f,-253.92f, -70.34f,0); - marshal_reginald_windsorAI->AddWaypoint(20, 549.20f,-252.40f, -70.34f,0); - marshal_reginald_windsorAI->AddWaypoint(21, 549.20f,-252.40f, -70.34f,4000); - marshal_reginald_windsorAI->AddWaypoint(22, 555.33f,-269.16f, -74.40f,0); - marshal_reginald_windsorAI->AddWaypoint(23, 554.31f,-270.88f, -74.40f,0); - marshal_reginald_windsorAI->AddWaypoint(24, 554.31f,-270.88f, -74.40f,4000); - marshal_reginald_windsorAI->AddWaypoint(25, 536.10f,-249.60f, -67.47f,0); - marshal_reginald_windsorAI->AddWaypoint(26, 520.94f,-216.65f, -59.28f,0); - marshal_reginald_windsorAI->AddWaypoint(27, 505.99f,-148.74f, -62.17f,0); - marshal_reginald_windsorAI->AddWaypoint(28, 484.21f,-56.24f, -62.43f,0); - marshal_reginald_windsorAI->AddWaypoint(29, 470.39f,-6.01f, -70.10f,0); - marshal_reginald_windsorAI->AddWaypoint(30, 451.27f,30.85f, -70.07f,0); - marshal_reginald_windsorAI->AddWaypoint(31, 452.45f,29.85f, -70.37f,1500); - marshal_reginald_windsorAI->AddWaypoint(32, 452.45f,29.85f, -70.37f,7000); - marshal_reginald_windsorAI->AddWaypoint(33, 452.45f,29.85f, -70.37f,10000); - marshal_reginald_windsorAI->AddWaypoint(34, 451.27f,31.85f, -70.07f,0); + marshal_reginald_windsorAI->AddWaypoint(0, 403.61f, -52.71f, -63.92f, 4000); + marshal_reginald_windsorAI->AddWaypoint(1, 403.61f, -52.71f, -63.92f, 4000); + marshal_reginald_windsorAI->AddWaypoint(2, 406.33f, -54.87f, -63.95f, 0); + marshal_reginald_windsorAI->AddWaypoint(3, 407.99f, -73.91f, -62.26f, 0); + marshal_reginald_windsorAI->AddWaypoint(4, 557.03f, -119.71f, -61.83f, 0); + marshal_reginald_windsorAI->AddWaypoint(5, 573.40f, -124.39f, -65.07f, 0); + marshal_reginald_windsorAI->AddWaypoint(6, 593.91f, -130.29f, -69.25f, 0); + marshal_reginald_windsorAI->AddWaypoint(7, 593.21f, -132.16f, -69.25f, 0); + marshal_reginald_windsorAI->AddWaypoint(8, 593.21f, -132.16f, -69.25f, 3000); + marshal_reginald_windsorAI->AddWaypoint(9, 622.81f, -135.55f, -71.92f, 0); + marshal_reginald_windsorAI->AddWaypoint(10, 634.68f, -151.29f, -70.32f, 0); + marshal_reginald_windsorAI->AddWaypoint(11, 635.06f, -153.25f, -70.32f, 0); + marshal_reginald_windsorAI->AddWaypoint(12, 635.06f, -153.25f, -70.32f, 3000); + marshal_reginald_windsorAI->AddWaypoint(13, 635.06f, -153.25f, -70.32f, 1500); + marshal_reginald_windsorAI->AddWaypoint(14, 655.25f, -172.39f, -73.72f, 0); + marshal_reginald_windsorAI->AddWaypoint(15, 654.79f, -226.30f, -83.06f, 0); + marshal_reginald_windsorAI->AddWaypoint(16, 622.85f, -268.85f, -83.96f, 0); + marshal_reginald_windsorAI->AddWaypoint(17, 579.45f, -275.56f, -80.44f, 0); + marshal_reginald_windsorAI->AddWaypoint(18, 561.19f, -266.85f, -75.59f, 0); + marshal_reginald_windsorAI->AddWaypoint(19, 547.91f, -253.92f, -70.34f, 0); + marshal_reginald_windsorAI->AddWaypoint(20, 549.20f, -252.40f, -70.34f, 0); + marshal_reginald_windsorAI->AddWaypoint(21, 549.20f, -252.40f, -70.34f, 4000); + marshal_reginald_windsorAI->AddWaypoint(22, 555.33f, -269.16f, -74.40f, 0); + marshal_reginald_windsorAI->AddWaypoint(23, 554.31f, -270.88f, -74.40f, 0); + marshal_reginald_windsorAI->AddWaypoint(24, 554.31f, -270.88f, -74.40f, 4000); + marshal_reginald_windsorAI->AddWaypoint(25, 536.10f, -249.60f, -67.47f, 0); + marshal_reginald_windsorAI->AddWaypoint(26, 520.94f, -216.65f, -59.28f, 0); + marshal_reginald_windsorAI->AddWaypoint(27, 505.99f, -148.74f, -62.17f, 0); + marshal_reginald_windsorAI->AddWaypoint(28, 484.21f, -56.24f, -62.43f, 0); + marshal_reginald_windsorAI->AddWaypoint(29, 470.39f, -6.01f, -70.10f, 0); + marshal_reginald_windsorAI->AddWaypoint(30, 451.27f, 30.85f, -70.07f, 0); + marshal_reginald_windsorAI->AddWaypoint(31, 452.45f, 29.85f, -70.37f, 1500); + marshal_reginald_windsorAI->AddWaypoint(32, 452.45f, 29.85f, -70.37f, 7000); + marshal_reginald_windsorAI->AddWaypoint(33, 452.45f, 29.85f, -70.37f, 10000); + marshal_reginald_windsorAI->AddWaypoint(34, 451.27f, 31.85f, -70.07f, 0); return marshal_reginald_windsorAI; } @@ -1035,7 +1035,7 @@ public: void EnterCombat(Unit* who) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->Say(SAY_WINDSOR_AGGRO1, LANG_UNIVERSAL, PlayerGUID); break; case 1: me->Say(SAY_WINDSOR_AGGRO2, LANG_UNIVERSAL, PlayerGUID); break; @@ -1046,7 +1046,7 @@ public: void JustDied(Unit *slayer) { - pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_FAILED); + pInstance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } void UpdateAI(const uint32 diff) @@ -1056,25 +1056,25 @@ public: { if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_JAZ,1); - pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREATURE_JAZ, 1); + pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_JAZ, ENCOUNTER_STATE_ENDED); } } else if (wp == 11) { if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_SHILL,1); - pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREATURE_SHILL, 1); + pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS) { - pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_SHILL, ENCOUNTER_STATE_ENDED); SetEscortPaused(false); } } @@ -1082,14 +1082,14 @@ public: { if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { - pInstance->SetData(DATA_CREATURE_CREST,1); + pInstance->SetData(DATA_CREATURE_CREST, 1); me->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID); - pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_IN_PROGRESS); } if (pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS) { SetEscortPaused(false); - pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_CREST, ENCOUNTER_STATE_ENDED); } } if (pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); @@ -1131,7 +1131,7 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escort::npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_IN_PROGRESS); } return true; } @@ -1160,7 +1160,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); } } @@ -1170,12 +1170,12 @@ public: { case 0:me->Say(SAY_TOBIAS_FREE, LANG_UNIVERSAL, PlayerGUID); break; case 2: - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_OBJECTIVE_COMPLETED);break; case 4: me->SetVisibility(VISIBILITY_OFF); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_ENDED); + pInstance->SetData(DATA_TOBIAS, ENCOUNTER_STATE_ENDED); break; } } @@ -1323,7 +1323,7 @@ public: { if (BreakKeg_Timer <= diff) { - DoGo(DATA_GO_BAR_KEG,0); + DoGo(DATA_GO_BAR_KEG, 0); BreakKeg_Timer = 0; BreakDoor_Timer = 1000; } else BreakKeg_Timer -= diff; @@ -1333,16 +1333,16 @@ public: { if (BreakDoor_Timer <= diff) { - DoGo(DATA_GO_BAR_DOOR,2); - DoGo(DATA_GO_BAR_KEG_TRAP,0); //doesn't work very well, leaving code here for future + DoGo(DATA_GO_BAR_DOOR, 2); + DoGo(DATA_GO_BAR_KEG_TRAP, 0); //doesn't work very well, leaving code here for future //spell by trap has effect61, this indicate the bar go hostile - if (Unit *tmp = Unit::GetUnit(*me,pInstance->GetData64(DATA_PHALANX))) + if (Unit *tmp = Unit::GetUnit(*me, pInstance->GetData64(DATA_PHALANX))) tmp->setFaction(14); //for later, this event(s) has alot more to it. //optionally, DONE can trigger bar to go hostile. - pInstance->SetData(TYPE_BAR,DONE); + pInstance->SetData(TYPE_BAR, DONE); BreakDoor_Timer = 0; } else BreakDoor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 6c5850f4029..1e8e5e74750 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -57,7 +57,7 @@ public: void SummonSpirits(Unit* victim) { - if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature *Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Spirit->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index ab6a09a11d0..2b90ddbcd11 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -81,7 +81,7 @@ public: if (HandOfThaurissan_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index de95d503fd6..e067cd90221 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -67,13 +67,13 @@ public: void SummonAdds(Unit* victim) { - if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14,14)), float(irand(-14,14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedAdd->AI()->AttackStart(victim); } void SummonMedics(Unit* victim) { - if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMedic->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 02435e94473..149b5ffc192 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -74,7 +74,7 @@ public: if (InstanceScript* pInstance = pCreature->GetInstanceScript()) { //are 5 minutes expected? go template may have data to despawn when used at quest - pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE),MINUTE*5); + pInstance->DoRespawnGameObject(pInstance->GetData64(DATA_GO_CHALICE), MINUTE*5); } break; } @@ -129,7 +129,7 @@ public: pCreature->AI()->AttackStart(pPlayer); InstanceScript* pInstance = pCreature->GetInstanceScript(); if (pInstance) - pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID()); + pInstance->SetData64(DATA_EVENSTARTER, pPlayer->GetGUID()); break; } return true; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 8b70079818c..92b0f216fff 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -386,8 +386,8 @@ public: void TombOfSevenReset() { - HandleGameObject(GoTombExitGUID,false);//event reseted, close exit door - HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door + HandleGameObject(GoTombExitGUID, false);//event reseted, close exit door + HandleGameObject(GoTombEnterGUID, true);//event reseted, open entrance door for (uint8 i = 0; i < 7; ++i) { if (Creature* boss = instance->GetCreature(TombBossGUIDs[i])) @@ -414,16 +414,16 @@ public: void TombOfSevenStart() { - HandleGameObject(GoTombExitGUID,false);//event started, close exit door - HandleGameObject(GoTombEnterGUID,false);//event started, close entrance door + HandleGameObject(GoTombExitGUID, false);//event started, close exit door + HandleGameObject(GoTombEnterGUID, false);//event started, close entrance door SetData(TYPE_TOMB_OF_SEVEN, IN_PROGRESS); } void TombOfSevenEnd() { - DoRespawnGameObject(GoChestGUID,DAY); - HandleGameObject(GoTombExitGUID,true);//event done, open exit door - HandleGameObject(GoTombEnterGUID,true);//event done, open entrance door + DoRespawnGameObject(GoChestGUID, DAY); + HandleGameObject(GoTombExitGUID, true);//event done, open exit door + HandleGameObject(GoTombEnterGUID, true);//event done, open entrance door TombEventStarterGUID = 0; SetData(TYPE_TOMB_OF_SEVEN, DONE); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp index 5c3c43f2566..3c467b1c7a8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp @@ -90,7 +90,7 @@ public: break; case EVENT_MOTHERS_MILK: DoCast(me, SPELL_MOTHERSMILK); - events.ScheduleEvent(EVENT_MOTHERS_MILK, urand(5*IN_MILLISECONDS,12500)); + events.ScheduleEvent(EVENT_MOTHERS_MILK, urand(5*IN_MILLISECONDS, 12500)); break; } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 5812779d3bb..4f71bdef129 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -89,11 +89,11 @@ public: if (!Summoned && HealthBelowPct(51)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN,300*IN_MILLISECONDS)) + if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN, 300*IN_MILLISECONDS)) warlord->AI()->AttackStart(target); - if (Creature* berserker = me->SummonCreature(NPC_SMOLDERTHORN_BERSERKER, SummonLocation2, TEMPSUMMON_TIMED_DESPAWN,300*IN_MILLISECONDS)) + if (Creature* berserker = me->SummonCreature(NPC_SMOLDERTHORN_BERSERKER, SummonLocation2, TEMPSUMMON_TIMED_DESPAWN, 300*IN_MILLISECONDS)) berserker->AI()->AttackStart(target); Summoned = true; } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index 42cc415a84e..14870a81289 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -82,14 +82,14 @@ public: if (BlastWave_Timer <= diff) { DoCast(me->getVictim(), SPELL_BLASTWAVE); - BlastWave_Timer = urand(8000,16000); + BlastWave_Timer = urand(8000, 16000); } else BlastWave_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { DoCast(me->getVictim(), SPELL_MORTALSTRIKE); - MortalStrike_Timer = urand(25000,35000); + MortalStrike_Timer = urand(25000, 35000); } else MortalStrike_Timer -= diff; if (KnockBack_Timer <= diff) @@ -97,9 +97,9 @@ public: DoCast(me->getVictim(), SPELL_KNOCKBACK); //Drop 50% aggro if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); - KnockBack_Timer = urand(15000,30000); + KnockBack_Timer = urand(15000, 30000); } else KnockBack_Timer -= diff; if (EnterEvadeIfOutOfCombatArea(diff)) diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index 337c39fbfa8..2202982e595 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -42,10 +42,10 @@ enum Spells SPELL_NATURE_VULNERABILITY = 22280, SPELL_ARCANE_VULNERABILITY = 22281, //Other spells - SPELL_INCINERATE = 23308, //Incinerate 23308,23309 + SPELL_INCINERATE = 23308, //Incinerate 23308, 23309 SPELL_TIMELAPSE = 23310, //Time lapse 23310, 23311(old threat mod that was removed in 2.01) SPELL_CORROSIVEACID = 23313, //Corrosive Acid 23313, 23314 - SPELL_IGNITEFLESH = 23315, //Ignite Flesh 23315,23316 + SPELL_IGNITEFLESH = 23315, //Ignite Flesh 23315, 23316 SPELL_FROSTBURN = 23187, //Frost burn 23187, 23189 //Brood Affliction 23173 - Scripted Spell that cycles through all targets within 100 yards and has a chance to cast one of the afflictions on them //Since Scripted spells arn't coded I'll just write a function that does the same thing @@ -77,7 +77,7 @@ public: //5 possiblities for the first breath, 4 for the second, 20 total possiblites //This way we don't end up casting 2 of the same breath //TL TL would be stupid - switch (urand(0,19)) + switch (urand(0, 19)) { //B1 - Incin case 0: @@ -284,7 +284,7 @@ public: { DoCast(me, SPELL_FRENZY); DoScriptText(EMOTE_FRENZY, me); - Frenzy_Timer = urand(10000,15000); + Frenzy_Timer = urand(10000, 15000); } else Frenzy_Timer -= diff; //Enrage if not already enraged and below 20% diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 304f4a23f66..73bea5bbc3c 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -71,7 +71,7 @@ public: if (ShadowFlame_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWFLAME); - ShadowFlame_Timer = urand(12000,15000); + ShadowFlame_Timer = urand(12000, 15000); } else ShadowFlame_Timer -= diff; //Wing Buffet Timer @@ -85,7 +85,7 @@ public: if (ShadowOfEbonroc_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWOFEBONROC); - ShadowOfEbonroc_Timer = urand(25000,350000); + ShadowOfEbonroc_Timer = urand(25000, 350000); } else ShadowOfEbonroc_Timer -= diff; if (me->getVictim()->HasAura(SPELL_SHADOWOFEBONROC)) @@ -93,7 +93,7 @@ public: if (Heal_Timer <= diff) { DoCast(me, SPELL_HEAL); - Heal_Timer = urand(1000,3000); + Heal_Timer = urand(1000, 3000); } else Heal_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index 248a2a9a24c..8ae3b52d289 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -68,7 +68,7 @@ public: if (ShadowFlame_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWFLAME); - ShadowFlame_Timer = urand(15000,18000); + ShadowFlame_Timer = urand(15000, 18000); } else ShadowFlame_Timer -= diff; //WingBuffet_Timer @@ -76,7 +76,7 @@ public: { DoCast(me->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-75); + DoModifyThreatPercent(me->getVictim(), -75); WingBuffet_Timer = 25000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index 5e846c44464..25e5306dae5 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -78,7 +78,7 @@ public: { DoCast(me->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-75); + DoModifyThreatPercent(me->getVictim(), -75); WingBuffet_Timer = 25000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index b57417f323a..0c975bdd171 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -112,7 +112,7 @@ public: void EnterCombat(Unit * who) { - DoScriptText(RAND(SAY_XHEALTH,SAY_AGGRO,SAY_SHADOWFLAME), me); + DoScriptText(RAND(SAY_XHEALTH, SAY_AGGRO, SAY_SHADOWFLAME), me); DoCast(who, SPELL_SHADOWFLAME_INITIAL); DoZoneInCombat(); @@ -174,7 +174,7 @@ public: //On official it is based on what classes are currently on the hostil list //but we can't do that yet so just randomly call one - switch (urand(0,8)) + switch (urand(0, 8)) { case 0: DoScriptText(SAY_MAGE, me); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 5c631f4b626..f97f081594e 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -83,21 +83,21 @@ public: if (Cleave_Timer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - Cleave_Timer = urand(7000,10000); + Cleave_Timer = urand(7000, 10000); } else Cleave_Timer -= diff; //WarStomp_Timer if (WarStomp_Timer <= diff) { DoCast(me->getVictim(), SPELL_WARSTOMP); - WarStomp_Timer = urand(15000,25000); + WarStomp_Timer = urand(15000, 25000); } else WarStomp_Timer -= diff; //FireballVolley_Timer if (FireballVolley_Timer <= diff) { DoCast(me->getVictim(), SPELL_FIREBALLVOLLEY); - FireballVolley_Timer = urand(12000,15000); + FireballVolley_Timer = urand(12000, 15000); } else FireballVolley_Timer -= diff; //Conflagration_Timer @@ -107,7 +107,7 @@ public: //We will remove this threat reduction and add an aura check. //if (DoGetThreat(me->getVictim())) - //DoModifyThreatPercent(me->getVictim(),-50); + //DoModifyThreatPercent(me->getVictim(), -50); Conflagration_Timer = 12000; } else Conflagration_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index c12b58a216c..c502828ab36 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -168,9 +168,9 @@ public: break; case 2: me->setFaction(103); - if (PlayerGUID && Unit::GetUnit((*me),PlayerGUID)) + if (PlayerGUID && Unit::GetUnit((*me), PlayerGUID)) { - AttackStart(Unit::GetUnit((*me),PlayerGUID)); + AttackStart(Unit::GetUnit((*me), PlayerGUID)); DoCast(me, SPELL_ESSENCEOFTHERED); } SpeechTimer = 0; @@ -202,7 +202,7 @@ public: if (FlameBreath_Timer <= diff) { DoCast(me->getVictim(), SPELL_FLAMEBREATH); - FlameBreath_Timer = urand(4000,8000); + FlameBreath_Timer = urand(4000, 8000); } else FlameBreath_Timer -= diff; //BurningAdrenalineCaster_Timer @@ -219,7 +219,7 @@ public: i = 3; } if (pTarget) // cast on self (see below) - pTarget->CastSpell(pTarget,SPELL_BURNINGADRENALINE,1); + pTarget->CastSpell(pTarget, SPELL_BURNINGADRENALINE, 1); BurningAdrenalineCaster_Timer = 15000; } else BurningAdrenalineCaster_Timer -= diff; @@ -229,7 +229,7 @@ public: { // have the victim cast the spell on himself otherwise the third effect aura will be applied // to Vael instead of the player - me->getVictim()->CastSpell(me->getVictim(),SPELL_BURNINGADRENALINE,1); + me->getVictim()->CastSpell(me->getVictim(), SPELL_BURNINGADRENALINE, 1); BurningAdrenalineTank_Timer = 45000; } else BurningAdrenalineTank_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index b077ba1d82a..a2165dbbd92 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -113,7 +113,7 @@ public: boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) { NefarianGUID = 0; - switch (urand(0,19)) + switch (urand(0, 19)) { case 0: DrakType1 = CREATURE_BRONZE_DRAKANOID; @@ -219,7 +219,7 @@ public: NefarianGUID = 0; NefCheckTime = 2000; - me->SetUInt32Value(UNIT_NPC_FLAGS,1); + me->SetUInt32Value(UNIT_NPC_FLAGS, 1); me->setFaction(35); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -237,7 +237,7 @@ public: AttackStart((*i)); } */ - me->SetUInt32Value(UNIT_NPC_FLAGS,0); + me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(103); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); AttackStart(pTarget); @@ -272,7 +272,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SHADOWBOLT); - ShadowBoltTimer = urand(3000,10000); + ShadowBoltTimer = urand(3000, 10000); } else ShadowBoltTimer -= diff; //FearTimer @@ -293,7 +293,7 @@ public: Unit *pTarget = NULL; //1 in 3 chance it will be a chromatic - if (urand(0,2) == 0) + if (urand(0, 2) == 0) CreatureID = CREATURE_CHROMATIC_DRAKANOID; else CreatureID = DrakType1; @@ -301,7 +301,7 @@ public: ++SpawnedAdds; //Spawn Creature and force it to start attacking a random target - Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID, ADD_X1, ADD_Y1, ADD_Z1, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -310,14 +310,14 @@ public: } //1 in 3 chance it will be a chromatic - if (urand(0,2) == 0) + if (urand(0, 2) == 0) CreatureID = CREATURE_CHROMATIC_DRAKANOID; else CreatureID = DrakType2; ++SpawnedAdds; - Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID, ADD_X2, ADD_Y2, ADD_Z2, 5.000f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -329,7 +329,7 @@ public: if (SpawnedAdds >= 42) { //Teleport Victor Nefarius way out of the map - //sMapMgr->GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0); + //sMapMgr->GetMap(me->GetMapId(), me)->CreatureRelocation(me, 0, 0, -5000, 0); //Interrupt any spell casting me->InterruptNonMeleeSpells(false); @@ -341,11 +341,11 @@ public: DoCast(me, 8149); //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues) - DoTeleportTo(HIDE_X,HIDE_Y,HIDE_Z); + DoTeleportTo(HIDE_X, HIDE_Y, HIDE_Z); me->AddUnitState(UNIT_STAT_FLEEING); //Spawn nef and have him attack a random target - Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); + Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN, NEF_X, NEF_Y, NEF_Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Nefarian) { @@ -363,7 +363,7 @@ public: { if (NefCheckTime <= diff) { - Unit* Nefarian = Unit::GetCreature((*me),NefarianGUID); + Unit* Nefarian = Unit::GetCreature((*me), NefarianGUID); //If nef is dead then we die to so the players get out of combat //and cannot repeat the event diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index bba334a943e..2a7ca7ff872 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -67,9 +67,9 @@ public: void Reset() { - uiTrashTimer = urand(5000,9000); + uiTrashTimer = urand(5000, 9000); uiSlamTimer = 9000; - uiNimbleReflexesTimer = urand(15500,31600); + uiNimbleReflexesTimer = urand(15500, 31600); uiHealth = 0; @@ -86,7 +86,7 @@ public: bool bCheckChances() { - uint32 uiChances = urand(0,99); + uint32 uiChances = urand(0, 99); if (uiChances <= 15) return false; else @@ -103,7 +103,7 @@ public: { if (bCheckChances()) DoCast(me, SPELL_TRASH); - uiTrashTimer = urand(6000,15500); + uiTrashTimer = urand(6000, 15500); } else uiTrashTimer -= uiDiff; if (uiSlamTimer <= uiDiff) @@ -117,17 +117,17 @@ public: { if (bCheckChances()) DoCast(me, SPELL_NIMBLE_REFLEXES); - uiNimbleReflexesTimer = urand(27300,60100); + uiNimbleReflexesTimer = urand(27300, 60100); } else uiNimbleReflexesTimer -= uiDiff; /*END ACID-AI*/ if ((uiHealth == 0 && !HealthAbovePct(66)) || (uiHealth == 1 && !HealthAbovePct(33))) { ++uiHealth; - DoCastAOE(SPELL_SMITE_STOMP,false); + DoCastAOE(SPELL_SMITE_STOMP, false); SetCombatMovement(false); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_SMITE_CHEST))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_SMITE_CHEST))) { me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(1, pGo->GetPositionX() - 3.0f, pGo->GetPositionY(), pGo->GetPositionZ()); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index f976d1ae418..370bcfe13b9 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -128,9 +128,9 @@ class instance_deadmines : public InstanceMapScript { if (GameObject* pIronCladDoor = instance->GetGameObject(IronCladDoorGUID)) { - Creature* DefiasPirate1 = pIronCladDoor->SummonCreature(657,pIronCladDoor->GetPositionX() - 2,pIronCladDoor->GetPositionY()-7,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); - Creature* DefiasPirate2 = pIronCladDoor->SummonCreature(657,pIronCladDoor->GetPositionX() + 3,pIronCladDoor->GetPositionY()-6,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); - Creature* DefiasCompanion = pIronCladDoor->SummonCreature(3450,pIronCladDoor->GetPositionX() + 2,pIronCladDoor->GetPositionY()-6,pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasPirate1 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() - 2, pIronCladDoor->GetPositionY()-7, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasPirate2 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() + 3, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); + Creature* DefiasCompanion = pIronCladDoor->SummonCreature(3450, pIronCladDoor->GetPositionX() + 2, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); DefiasPirate1GUID = DefiasPirate1->GetGUID(); DefiasPirate2GUID = DefiasPirate2->GetGUID(); @@ -157,7 +157,7 @@ class instance_deadmines : public InstanceMapScript void MoveCreatureInside(Creature* creature) { creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - creature->GetMotionMaster()->MovePoint(0, -102.7f,-655.9f, creature->GetPositionZ()); + creature->GetMotionMaster()->MovePoint(0, -102.7f, -655.9f, creature->GetPositionZ()); } void ShootCannon() @@ -239,7 +239,7 @@ class instance_deadmines : public InstanceMapScript WorldPacket data(4); data.SetOpcode(SMSG_PLAY_SOUND); data << uint32(sound); - unit->SendMessageToSet(&data,false); + unit->SendMessageToSet(&data, false); } void DoPlaySoundCreature(Unit* unit, uint32 sound) @@ -247,7 +247,7 @@ class instance_deadmines : public InstanceMapScript WorldPacket data(4); data.SetOpcode(SMSG_PLAY_SOUND); data << uint32(sound); - unit->SendMessageToSet(&data,false); + unit->SendMessageToSet(&data, false); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index 8b683215bed..2fc6c76caf8 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -66,23 +66,23 @@ enum eBlastmasterEmiShortfuse const Position SpawnPosition[] = { - {-557.630f,-114.514f,-152.209f,0.641f}, - {-555.263f,-113.802f,-152.737f,0.311f}, - {-552.154f,-112.476f,-153.349f,0.621f}, - {-548.692f,-111.089f,-154.090f,0.621f}, - {-546.905f,-108.340f,-154.877f,0.729f}, - {-547.736f,-105.154f,-155.176f,0.372f}, - {-547.274f,-114.109f,-153.952f,0.735f}, - {-552.534f,-110.012f,-153.577f,0.747f}, - {-550.708f,-116.436f,-153.103f,0.679f}, - {-554.030f,-115.983f,-152.635f,0.695f}, - {-494.595f,-87.516f,149.116f,3.344f}, - {-493.349f,-90.845f,-148.882f,3.717f}, - {-491.995f,-87.619f,-148.197f,3.230f}, - {-490.732f,-90.739f,-148.091f,3.230f}, - {-490.554f,-89.114f,-148.055f,3.230f}, - {-495.240f,-90.808f,-149.493f,3.238f}, - {-494.195f,-89.553f,-149.131f,3.254f} + {-557.630f, -114.514f, -152.209f, 0.641f}, + {-555.263f, -113.802f, -152.737f, 0.311f}, + {-552.154f, -112.476f, -153.349f, 0.621f}, + {-548.692f, -111.089f, -154.090f, 0.621f}, + {-546.905f, -108.340f, -154.877f, 0.729f}, + {-547.736f, -105.154f, -155.176f, 0.372f}, + {-547.274f, -114.109f, -153.952f, 0.735f}, + {-552.534f, -110.012f, -153.577f, 0.747f}, + {-550.708f, -116.436f, -153.103f, 0.679f}, + {-554.030f, -115.983f, -152.635f, 0.695f}, + {-494.595f, -87.516f, 149.116f, 3.344f}, + {-493.349f, -90.845f, -148.882f, 3.717f}, + {-491.995f, -87.619f, -148.197f, 3.230f}, + {-490.732f, -90.739f, -148.091f, 3.230f}, + {-490.554f, -89.114f, -148.055f, 3.230f}, + {-495.240f, -90.808f, -149.493f, 3.238f}, + {-494.195f, -89.553f, -149.131f, 3.254f} }; class npc_blastmaster_emi_shortfuse : public CreatureScript @@ -101,10 +101,10 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { if (npc_escortAI* pEscortAI = CAST_AI(npc_blastmaster_emi_shortfuse::npc_blastmaster_emi_shortfuseAI, pCreature->AI())) - pEscortAI->Start(true, false,pPlayer->GetGUID()); + pEscortAI->Start(true, false, pPlayer->GetGUID()); pCreature->setFaction(pPlayer->getFaction()); - pCreature->AI()->SetData(1,0); + pCreature->AI()->SetData(1, 0); pPlayer->CLOSE_GOSSIP_MENU(); } @@ -154,7 +154,7 @@ public: } } - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + void NextStep(uint32 uiTimerStep, bool bNextStep = true, uint8 uiPhaseStep = 0) { uiTimer = uiTimerStep; if (bNextStep) @@ -174,14 +174,14 @@ public: { if (pGo) { - if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(),pGo->GetPositionZ(), 0, 1)) + if (Creature *trigger = pGo->SummonTrigger(pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 1)) { //visual effects are not working! ¬¬ - trigger->CastSpell(trigger,11542,true); - trigger->CastSpell(trigger,35470,true); + trigger->CastSpell(trigger, 11542, true); + trigger->CastSpell(trigger, 35470, true); } pGo->RemoveFromWorld(); - //pGo->CastSpell(me,12158); makes all die?! + //pGo->CastSpell(me, 12158); makes all die?! } } } @@ -189,12 +189,12 @@ public: if (bBool) { if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, false, pGo); }else if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, false, pGo); } void SetInFace(bool bBool) @@ -204,10 +204,10 @@ public: if (bBool) { - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) me->SetFacingToObject(pGo); }else - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) me->SetFacingToObject(pGo); } @@ -216,11 +216,11 @@ public: if (!pInstance) return; - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, false, pGo); - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,false,pGo); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, false, pGo); if (!GoSummonList.empty()) for (std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) @@ -277,47 +277,47 @@ public: { case 3: SetEscortPaused(true); - NextStep(2000,false,3); + NextStep(2000, false, 3); break; case 7: SetEscortPaused(true); - NextStep(2000,false,4); + NextStep(2000, false, 4); break; case 9: - NextStep(1000,false,8); + NextStep(1000, false, 8); break; case 10: - NextStep(25000,false,10); + NextStep(25000, false, 10); break; case 11: SetEscortPaused(true); SetInFace(true); - NextStep(1000,false,11); + NextStep(1000, false, 11); break; case 12: - NextStep(25000,false,18); + NextStep(25000, false, 18); break; case 13: Summon(7); - NextStep(25000,false,19); + NextStep(25000, false, 19); break; case 14: SetInFace(false); - DoScriptText(SAY_BLASTMASTER_26,me); + DoScriptText(SAY_BLASTMASTER_26, me); SetEscortPaused(true); - NextStep(5000,false,20); + NextStep(5000, false, 20); break; } } - void SetData(uint32 uiI,uint32 uiValue) + void SetData(uint32 uiI, uint32 uiValue) { switch(uiI) { case 1: SetEscortPaused(true); - DoScriptText(SAY_BLASTMASTER_0,me); - NextStep(1500,true); + DoScriptText(SAY_BLASTMASTER_0, me); + NextStep(1500, true); break; case 2: if (!pInstance) @@ -330,7 +330,7 @@ public: break; case 2: pInstance->SetData(TYPE_EVENT, DONE); - NextStep(5000,false,22); + NextStep(5000, false, 22); break; } break; @@ -354,10 +354,10 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 2: - if (GameObject* pGo = me->SummonGameObject(183410, -533.140f,-105.322f,-156.016f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -533.140f, -105.322f, -156.016f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! } Summon(3); break; @@ -366,20 +366,20 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); - DoScriptText(SAY_BLASTMASTER_19,me); + DoScriptText(SAY_BLASTMASTER_19, me); break; case 4: - if (GameObject* pGo = me->SummonGameObject(183410, -542.199f,-96.854f,-155.790f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -542.199f, -96.854f, -155.790f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case 5: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); - DoScriptText(SAY_BLASTMASTER_15,me); + DoScriptText(SAY_BLASTMASTER_15, me); break; case 6: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[10], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); @@ -389,23 +389,23 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 7: - if (GameObject* pGo = me->SummonGameObject(183410, -507.820f,-103.333f,-151.353f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -507.820f, -103.333f, -151.353f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! Summon(6); } break; case 8: - if (GameObject* pGo = me->SummonGameObject(183410, -511.829f,-86.249f,-151.431f, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -511.829f, -86.249f, -151.431f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); //We can't use it! } break; case 9: if (Creature* pGrubbis = me->SummonCreature(NPC_GRUBBIS, SpawnPosition[15], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000)) - DoScriptText(SAY_GRUBBIS,pGrubbis); + DoScriptText(SAY_GRUBBIS, pGrubbis); me->SummonCreature(NPC_CHOMPER, SpawnPosition[16], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; } @@ -420,109 +420,109 @@ public: switch(uiPhase) { case 1: - DoScriptText(SAY_BLASTMASTER_1,me); - NextStep(1500,true); + DoScriptText(SAY_BLASTMASTER_1, me); + NextStep(1500, true); break; case 2: SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 3: - DoScriptText(SAY_BLASTMASTER_2,me); + DoScriptText(SAY_BLASTMASTER_2, me); SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 4: - DoScriptText(SAY_BLASTMASTER_3,me); - NextStep(3000,true); + DoScriptText(SAY_BLASTMASTER_3, me); + NextStep(3000, true); break; case 5: - DoScriptText(SAY_BLASTMASTER_4,me); - NextStep(3000,true); + DoScriptText(SAY_BLASTMASTER_4, me); + NextStep(3000, true); break; case 6: SetInFace(true); - DoScriptText(SAY_BLASTMASTER_5,me); + DoScriptText(SAY_BLASTMASTER_5, me); Summon(1); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) - pInstance->HandleGameObject(0,true,pGo); - NextStep(3000,true); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_RIGHT))) + pInstance->HandleGameObject(0, true, pGo); + NextStep(3000, true); break; case 7: - DoScriptText(SAY_BLASTMASTER_6,me); + DoScriptText(SAY_BLASTMASTER_6, me); SetEscortPaused(false); - NextStep(0,false,0); + NextStep(0, false, 0); break; case 8: me->HandleEmoteCommand(EMOTE_STATE_WORK); - NextStep(25000,true); + NextStep(25000, true); break; case 9: Summon(2); - NextStep(0,false); + NextStep(0, false); break; case 10: Summon(4); - NextStep(0,false); + NextStep(0, false); break; case 11: - DoScriptText(SAY_BLASTMASTER_17,me); - NextStep(5000,true); + DoScriptText(SAY_BLASTMASTER_17, me); + NextStep(5000, true); break; case 12: - DoScriptText(SAY_BLASTMASTER_18,me); - NextStep(5000,true); + DoScriptText(SAY_BLASTMASTER_18, me); + NextStep(5000, true); break; case 13: - DoScriptText(SAY_BLASTMASTER_20,me); + DoScriptText(SAY_BLASTMASTER_20, me); CaveDestruction(true); - NextStep(8000,true); + NextStep(8000, true); break; case 14: - DoScriptText(SAY_BLASTMASTER_21,me); - NextStep(8500,true); + DoScriptText(SAY_BLASTMASTER_21, me); + NextStep(8500, true); break; case 15: - DoScriptText(SAY_BLASTMASTER_22,me); - NextStep(2000,true); + DoScriptText(SAY_BLASTMASTER_22, me); + NextStep(2000, true); break; case 16: - DoScriptText(SAY_BLASTMASTER_23,me); + DoScriptText(SAY_BLASTMASTER_23, me); SetInFace(false); if (pInstance) - if (GameObject* pGo = GameObject::GetGameObject((*me),pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) - pInstance->HandleGameObject(0,true,pGo); - NextStep(2000,true); + if (GameObject* pGo = GameObject::GetGameObject((*me), pInstance->GetData64(DATA_GO_CAVE_IN_LEFT))) + pInstance->HandleGameObject(0, true, pGo); + NextStep(2000, true); break; case 17: SetEscortPaused(false); - DoScriptText(SAY_BLASTMASTER_24,me); + DoScriptText(SAY_BLASTMASTER_24, me); Summon(6); - NextStep(0,false); + NextStep(0, false); break; case 18: Summon(7); - NextStep(0,false); + NextStep(0, false); break; case 19: SetInFace(false); Summon(8); - DoScriptText(SAY_BLASTMASTER_25,me); - NextStep(0,false); + DoScriptText(SAY_BLASTMASTER_25, me); + NextStep(0, false); break; case 20: - DoScriptText(SAY_BLASTMASTER_27,me); - NextStep(2000,true); + DoScriptText(SAY_BLASTMASTER_27, me); + NextStep(2000, true); break; case 21: Summon(9); - NextStep(0,false); + NextStep(0, false); break; case 22: CaveDestruction(false); - DoScriptText(SAY_BLASTMASTER_20,me); - NextStep(0,false); + DoScriptText(SAY_BLASTMASTER_20, me); + NextStep(0, false); break; } } else uiTimer -= uiDiff; @@ -566,7 +566,7 @@ public: return; if (Unit* pSummon = CAST_SUM(me)->GetSummoner()) - CAST_CRE(pSummon)->AI()->SetData(2,1); + CAST_CRE(pSummon)->AI()->SetData(2, 1); } void UpdateAI(const uint32 /*diff*/) @@ -583,7 +583,7 @@ public: return; if (Unit* pSummon = CAST_SUM(me)->GetSummoner()) - CAST_CRE(pSummon)->AI()->SetData(2,2); + CAST_CRE(pSummon)->AI()->SetData(2, 2); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 884c9ecc731..8b42c7135e5 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -90,12 +90,12 @@ public: case GO_CAVE_IN_LEFT: uiCaveInLeftGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED) - HandleGameObject(0,false,go); + HandleGameObject(0, false, go); break; case GO_CAVE_IN_RIGHT: uiCaveInRightGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE || m_auiEncounter[0] == NOT_STARTED) - HandleGameObject(0,false,go); + HandleGameObject(0, false, go); break; } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 612626909ef..94155f51f11 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -77,7 +77,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -159,9 +159,9 @@ public: } else { - if (urand(0,1) == 0) + if (urand(0, 1) == 0) { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); } } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index a550cff0df5..84dcf2d40b8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -74,8 +74,8 @@ public: void KilledUnit(Unit* /*Victim*/) { - if (urand(0,1) == 0) - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + if (urand(0, 1) == 0) + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -108,9 +108,9 @@ public: if (Repentance_Timer <= diff) { DoCast(me->getVictim(), SPELL_REPENTANCE); - DoScriptText(RAND(SAY_REPENTANCE1,SAY_REPENTANCE2), me); + DoScriptText(RAND(SAY_REPENTANCE1, SAY_REPENTANCE2), me); - Repentance_Timer = urand(25000,35000); //A little randomness on that spell + Repentance_Timer = urand(25000, 35000); //A little randomness on that spell } else Repentance_Timer -= diff; if (Holyfire_Timer <= diff) @@ -118,7 +118,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYFIRE); - Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! + Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! } else Holyfire_Timer -= diff; if (Holywrath_Timer <= diff) @@ -126,7 +126,7 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_HOLYWRATH); - Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice + Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice } else Holywrath_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 03721d01fb7..ba6908fd2e9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -62,9 +62,9 @@ public: { Phase = 1; - CleaveTimer = urand(10000,15000); + CleaveTimer = urand(10000, 15000); CurseTimer = 30000; - RandomYellTimer = urand(30000,60000); //Occasionally yell + RandomYellTimer = urand(30000, 60000); //Occasionally yell ChargeTimer = 20000; ResetTimer = 0; } @@ -86,7 +86,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -159,7 +159,7 @@ public: Attumen = pAttumen->GetGUID(); pAttumen->AI()->AttackStart(me->getVictim()); SetMidnight(pAttumen, me->GetGUID()); - DoScriptText(RAND(SAY_APPEAR1,SAY_APPEAR2,SAY_APPEAR3), pAttumen); + DoScriptText(RAND(SAY_APPEAR1, SAY_APPEAR2, SAY_APPEAR3), pAttumen); } } else if (Phase == 2 && HealthBelowPct(25)) @@ -185,7 +185,7 @@ public: pAttumen->GetMotionMaster()->MoveChase(pAttumen->getVictim()); pAttumen->SetUInt64Value(UNIT_FIELD_TARGET, pAttumen->getVictim()->GetGUID()); } - pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X,1); + pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X, 1); } } else Mount_Timer -= diff; } @@ -206,7 +206,7 @@ public: float newX = me->GetPositionX() + cos(angle)*(distance/2) ; float newY = me->GetPositionY() + sin(angle)*(distance/2) ; float newZ = 50; - //me->Relocate(newX,newY,newZ,angle); + //me->Relocate(newX, newY, newZ, angle); //me->SendMonsterMove(newX, newY, newZ, 0, true, 1000); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(0, newX, newY, newZ); @@ -215,7 +215,7 @@ public: newY = me->GetPositionY() + sin(angle)*(distance/2) ; pAttumen->GetMotionMaster()->Clear(); pAttumen->GetMotionMaster()->MovePoint(0, newX, newY, newZ); - //pAttumen->Relocate(newX,newY,newZ,-angle); + //pAttumen->Relocate(newX, newY, newZ, -angle); //pAttumen->SendMonsterMove(newX, newY, newZ, 0, true, 1000); Mount_Timer = 1000; } @@ -257,7 +257,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (CleaveTimer <= diff) { DoCast(me->getVictim(), SPELL_SHADOWCLEAVE); - CleaveTimer = urand(10000,15000); + CleaveTimer = urand(10000, 15000); } else CleaveTimer -= diff; if (CurseTimer <= diff) @@ -268,8 +268,8 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff) if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_RANDOM1,SAY_RANDOM2), me); - RandomYellTimer = urand(30000,60000); + DoScriptText(RAND(SAY_RANDOM1, SAY_RANDOM2), me); + RandomYellTimer = urand(30000, 60000); } else RandomYellTimer -= diff; if (me->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index c14b60eed41..80a86c62318 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -133,7 +133,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); } void JustDied(Unit* /*victim*/) @@ -207,7 +207,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Creature::GetCreature((*me),AddGUID[i]); + Temp = Creature::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) Temp->DisappearAndDie(); } @@ -221,7 +221,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Creature::GetCreature((*me),AddGUID[i]); + Temp = Creature::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) { Temp->AI()->AttackStart(me->getVictim()); @@ -256,7 +256,7 @@ public: Creature* Temp = NULL; if (AddGUID[i]) { - Temp = Unit::GetCreature((*me),AddGUID[i]); + Temp = Unit::GetCreature((*me), AddGUID[i]); if (Temp && Temp->isAlive()) if (!Temp->getVictim()) Temp->AI()->AttackStart(me->getVictim()); @@ -300,10 +300,10 @@ public: { if (Wait_Timer <= diff) { - DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2), me); + DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget, SPELL_GARROTE,true); + pTarget->CastSpell(pTarget, SPELL_GARROTE, true); InVanish = false; } else Wait_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index a836a4fdf12..8a96f761798 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -52,11 +52,11 @@ enum Netherspite_Portal{ }; const uint32 PortalID[3] = {17369, 17367, 17368}; -const uint32 PortalVisual[3] = {30487,30490,30491}; -const uint32 PortalBeam[3] = {30465,30464,30463}; -const uint32 PlayerBuff[3] = {30421,30422,30423}; -const uint32 NetherBuff[3] = {30466,30467,30468}; -const uint32 PlayerDebuff[3] = {38637,38638,38639}; +const uint32 PortalVisual[3] = {30487, 30490, 30491}; +const uint32 PortalBeam[3] = {30465, 30464, 30463}; +const uint32 PlayerBuff[3] = {30421, 30422, 30423}; +const uint32 NetherBuff[3] = {30466, 30467, 30468}; +const uint32 PlayerDebuff[3] = {38637, 38638, 38639}; class boss_netherspite : public CreatureScript { @@ -110,10 +110,10 @@ public: yh = pTarget->GetPositionY(); // check if target is between (not checking distance from the beam yet) - if (dist(xn,yn,xh,yh) >= dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh) >= dist(xn,yn,xp,yp)) + if (dist(xn, yn, xh, yh) >= dist(xn, yn, xp, yp) || dist(xp, yp, xh, yh) >= dist(xn, yn, xp, yp)) return false; // check distance from the beam - return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn,yn,xp,yp) < 1.5f); + return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn, yn, xp, yp) < 1.5f); } float dist(float xa, float ya, float xb, float yb) // auxiliary method for distance @@ -141,7 +141,7 @@ public: pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0) for (int i=0; i<3; ++i) - if (Creature *portal = me->SummonCreature(PortalID[i],PortalCoord[pos[i]][0],PortalCoord[pos[i]][1],PortalCoord[pos[i]][2],0,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) { PortalGUID[i] = portal->GetGUID(); portal->AddAura(PortalVisual[i], portal); @@ -181,9 +181,9 @@ public: Player* p = i->getSource(); if (p && p->isAlive() // alive && (!pTarget || pTarget->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best - && !p->HasAura(PlayerDebuff[j],0) // not exhausted - && !p->HasAura(PlayerBuff[(j+1)%3],0) // not on another beam - && !p->HasAura(PlayerBuff[(j+2)%3],0) + && !p->HasAura(PlayerDebuff[j], 0) // not exhausted + && !p->HasAura(PlayerBuff[(j+1)%3], 0) // not on another beam + && !p->HasAura(PlayerBuff[(j+2)%3], 0) && IsBetween(me, p, portal)) // on the beam pTarget = p; } @@ -206,7 +206,7 @@ public: BeamerGUID[j] = 0; } // create new one and start beaming on the target - if (Creature *beamer = portal->SummonCreature(PortalID[j],portal->GetPositionX(),portal->GetPositionY(),portal->GetPositionZ(),portal->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000)) { beamer->CastSpell(pTarget, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); @@ -227,7 +227,7 @@ public: PortalPhase = true; PortalTimer = 10000; EmpowermentTimer = 10000; - DoScriptText(EMOTE_PHASE_PORTAL,me); + DoScriptText(EMOTE_PHASE_PORTAL, me); } void SwitchToBanishPhase() @@ -239,7 +239,7 @@ public: DestroyPortals(); PhaseTimer = 30000; PortalPhase = false; - DoScriptText(EMOTE_PHASE_BANISH,me); + DoScriptText(EMOTE_PHASE_BANISH, me); for (int i=0; i<3; ++i) me->RemoveAurasDueToSpell(NetherBuff[i]); @@ -271,7 +271,7 @@ public: // Void Zone if (VoidZoneTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,45,true),SPELL_VOIDZONE,true); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true); VoidZoneTimer = 15000; } else VoidZoneTimer -= diff; @@ -314,9 +314,9 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,40,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) DoCast(pTarget, SPELL_NETHERBREATH); - NetherbreathTimer = urand(5000,7000); + NetherbreathTimer = urand(5000, 7000); } else NetherbreathTimer -= diff; if (PhaseTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index d4d8b8d67d5..4c954c2dd51 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -48,14 +48,14 @@ EndScriptData */ float IntroWay[8][3] = { - {-11053.37f,-1794.48f,149.00f}, - {-11141.07f,-1841.40f,125.00f}, - {-11187.28f,-1890.23f,125.00f}, - {-11189.20f,-1931.25f,125.00f}, - {-11153.76f,-1948.93f,125.00f}, - {-11128.73f,-1929.75f,125.00f}, - {-11140.00f,-1915.00f,122.00f}, - {-11163.00f,-1903.00f,91.473f} + {-11053.37f, -1794.48f, 149.00f}, + {-11141.07f, -1841.40f, 125.00f}, + {-11187.28f, -1890.23f, 125.00f}, + {-11189.20f, -1931.25f, 125.00f}, + {-11153.76f, -1948.93f, 125.00f}, + {-11128.73f, -1929.75f, 125.00f}, + {-11140.00f, -1915.00f, 122.00f}, + {-11163.00f, -1903.00f, 91.473f} }; class boss_nightbane : public CreatureScript @@ -140,7 +140,7 @@ public: if (!Intro) { - me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0); + me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0); me->GetMotionMaster()->MoveTargetedHome(); } } @@ -193,7 +193,7 @@ public: if (id >= 8) { Intro = false; - me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0); + me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0); return; } @@ -242,11 +242,11 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); (*me).GetMotionMaster()->Clear(false); - (*me).GetMotionMaster()->MovePoint(0,IntroWay[2][0],IntroWay[2][1],IntroWay[2][2]); + (*me).GetMotionMaster()->MovePoint(0, IntroWay[2][0], IntroWay[2][1], IntroWay[2][2]); Flying = true; - FlyTimer = urand(45000,60000); //timer wrong between 45 and 60 seconds + FlyTimer = urand(45000, 60000); //timer wrong between 45 and 60 seconds ++FlyCount; RainofBonesTimer = 5000; //timer wrong (maybe) @@ -265,11 +265,11 @@ public: { me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); + me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]); } else { - me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); + me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]); ++MovePhase; } } @@ -279,11 +279,11 @@ public: { me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); - me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]); + me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]); } else { - me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]); + me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]); ++MovePhase; } } @@ -310,7 +310,7 @@ public: if (BellowingRoarTimer <= diff) { DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); - BellowingRoarTimer = urand(30000,40000); + BellowingRoarTimer = urand(30000, 40000); } else BellowingRoarTimer -= diff; if (SmolderingBreathTimer <= diff) @@ -402,10 +402,10 @@ public: if (FlyTimer <= diff) //landing { - me->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0); + me->MonsterYell(RAND(*YELL_LAND_PHASE_1, *YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0); me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]); + me->GetMotionMaster()->MovePoint(3, IntroWay[3][0], IntroWay[3][1], IntroWay[3][2]); Flying = true; } else FlyTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index ad33f9f9398..c016b232939 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -42,7 +42,7 @@ EndScriptData */ // 18 Coordinates for Infernal spawns struct InfernalPoint { - float x,y; + float x, y; }; #define INFERNAL_Z 275.5f @@ -230,8 +230,8 @@ public: Cleave_Timer = 8000; InfernalTimer = 45000; InfernalCleanupTimer = 47000; - AxesTargetSwitchTimer = urand(7500,20000); - SunderArmorTimer = urand(5000,10000); + AxesTargetSwitchTimer = urand(7500, 20000); + SunderArmorTimer = urand(5000, 10000); phase = 1; if (pInstance) @@ -240,7 +240,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -379,7 +379,7 @@ public: DoCast(Infernal, SPELL_INFERNAL_RELAY); } - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); } void UpdateAI(const uint32 diff) @@ -477,14 +477,14 @@ public: if (SunderArmorTimer <= diff) { DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); - SunderArmorTimer = urand(10000,18000); + SunderArmorTimer = urand(10000, 18000); } else SunderArmorTimer -= diff; if (Cleave_Timer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - Cleave_Timer = urand(6000,12000); + Cleave_Timer = urand(6000, 12000); } else Cleave_Timer -= diff; } @@ -492,7 +492,7 @@ public: { if (AxesTargetSwitchTimer <= diff) { - AxesTargetSwitchTimer = urand(7500,20000); + AxesTargetSwitchTimer = urand(7500, 20000); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -515,7 +515,7 @@ public: { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); - AmplifyDamageTimer = urand(20000,30000); + AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; } 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 cabc7426d81..6218b72bcdf 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -159,7 +159,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); } void JustDied(Unit * /*victim*/) @@ -175,7 +175,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) { @@ -345,7 +345,7 @@ public: if (SecondarySpellTimer <= diff) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(me, SPELL_AOE_CS); @@ -355,7 +355,7 @@ public: DoCast(pTarget, SPELL_CHAINSOFICE); break; } - SecondarySpellTimer = urand(5000,20000); + SecondarySpellTimer = urand(5000, 20000); } else SecondarySpellTimer -= diff; if (SuperCastTimer <= diff) @@ -378,12 +378,12 @@ public: break; } - LastSuperSpell = Available[urand(0,1)]; + LastSuperSpell = Available[urand(0, 1)]; switch (LastSuperSpell) { case SUPER_AE: - DoScriptText(RAND(SAY_EXPLOSION1,SAY_EXPLOSION2), me); + DoScriptText(RAND(SAY_EXPLOSION1, SAY_EXPLOSION2), me); DoCast(me, SPELL_BLINK_CENTER, true); DoCast(me, SPELL_PLAYERPULL, true); @@ -392,7 +392,7 @@ public: break; case SUPER_FLAME: - DoScriptText(RAND(SAY_FLAMEWREATH1,SAY_FLAMEWREATH2), me); + DoScriptText(RAND(SAY_FLAMEWREATH1, SAY_FLAMEWREATH2), me); FlameWreathTimer = 20000; FlameWreathCheckTime = 500; @@ -405,7 +405,7 @@ public: break; case SUPER_BLIZZARD: - DoScriptText(RAND(SAY_BLIZZARD1,SAY_BLIZZARD2), me); + DoScriptText(RAND(SAY_BLIZZARD1, SAY_BLIZZARD2), me); if (Creature* pSpawn = me->SummonCreature(CREATURE_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000)) { @@ -415,7 +415,7 @@ public: break; } - SuperCastTimer = urand(35000,40000); + SuperCastTimer = urand(35000, 40000); } else SuperCastTimer -= diff; if (!ElementalsSpawned && HealthBelowPct(40)) @@ -542,7 +542,7 @@ public: if (CastTimer <= diff) { DoCast(me->getVictim(), SPELL_WATERBOLT); - CastTimer = urand(2000,5000); + CastTimer = urand(2000, 5000); } else CastTimer -= diff; } }; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index a763e353860..9c60fafb5a3 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -119,7 +119,7 @@ public: me->InterruptNonMeleeSpells(false); DoCast(me->getVictim(), SPELL_AMPLIFY_FLAMES); - AmplifyTimer = urand(10000,20000); + AmplifyTimer = urand(10000, 20000); } else AmplifyTimer -= diff; DoMeleeAttackIfReady(); @@ -157,7 +157,7 @@ public: { if (SacrificeGUID) { - Unit* Sacrifice = Unit::GetUnit((*me),SacrificeGUID); + Unit* Sacrifice = Unit::GetUnit((*me), SacrificeGUID); if (Sacrifice) Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE); } @@ -178,7 +178,7 @@ public: struct mob_fiendish_portalAI : public PassiveAI { - mob_fiendish_portalAI(Creature *c) : PassiveAI(c),summons(me){} + mob_fiendish_portalAI(Creature *c) : PassiveAI(c), summons(me){} SummonList summons; @@ -333,7 +333,7 @@ public: if (pSummoned->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SPELL_FIENDISH_PORTAL_1) { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); SummonedPortals = true; } } @@ -341,7 +341,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*killer*/) @@ -380,7 +380,7 @@ public: { CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = pTarget->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); - DoScriptText(RAND(SAY_SACRIFICE1,SAY_SACRIFICE2), me); + DoScriptText(RAND(SAY_SACRIFICE1, SAY_SACRIFICE2), me); SacrificeTimer = 30000; } } @@ -402,7 +402,7 @@ public: if (PortalGUID[0] && PortalGUID[1]) { - if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0,1)])) + if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0, 1)])) pPortal->CastSpell(me->getVictim(), SPELL_SUMMON_FIENDISIMP, false); SummonTimer = 5000; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 4c354ad048a..ddb5970d155 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -345,7 +345,7 @@ public: if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10))) { /* - if (not direct damage(aoe,dot)) + if (not direct damage(aoe, dot)) return; */ @@ -597,19 +597,19 @@ public: if (MangleTimer <= diff) { DoCast(me->getVictim(), SPELL_MANGLE); - MangleTimer = urand(5000,8000); + MangleTimer = urand(5000, 8000); } else MangleTimer -= diff; if (ShredTimer <= diff) { DoCast(me->getVictim(), SPELL_SHRED); - ShredTimer = urand(10000,15000); + ShredTimer = urand(10000, 15000); } else ShredTimer -= diff; if (ScreamTimer <= diff) { DoCast(me->getVictim(), SPELL_FRIGHTENED_SCREAM); - ScreamTimer = urand(20000,30000); + ScreamTimer = urand(20000, 30000); } else ScreamTimer -= diff; DoMeleeAttackIfReady(); @@ -653,7 +653,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_CRONE_AGGRO,SAY_CRONE_AGGRO2), me); + DoScriptText(RAND(SAY_CRONE_AGGRO, SAY_CRONE_AGGRO2), me); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } @@ -683,7 +683,7 @@ public: if (CycloneTimer <= diff) { - if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0,9)), float(urand(0,9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) + if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0, 9)), float(urand(0, 9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true); CycloneTimer = 30000; } else CycloneTimer -= diff; @@ -737,7 +737,7 @@ public: Position pos; me->GetRandomNearPosition(pos, 10); me->GetMotionMaster()->MovePoint(0, pos); - MoveTimer = urand(5000,8000); + MoveTimer = urand(5000, 8000); } else MoveTimer -= diff; } }; @@ -905,13 +905,13 @@ public: if (FearTimer <= diff) { DoCast(me->getVictim(), SPELL_TERRIFYING_HOWL); - FearTimer = urand(25000,35000); + FearTimer = urand(25000, 35000); } else FearTimer -= diff; if (SwipeTimer <= diff) { DoCast(me->getVictim(), SPELL_WIDE_SWIPE); - SwipeTimer = urand(25000,30000); + SwipeTimer = urand(25000, 30000); } else SwipeTimer -= diff; } @@ -1293,27 +1293,27 @@ public: if (pTarget && !me->HasInArc(M_PI, pTarget)) { DoCast(pTarget, SPELL_BACKWARD_LUNGE); - BackwardLungeTimer = urand(15000,30000); + BackwardLungeTimer = urand(15000, 30000); } } else BackwardLungeTimer -= diff; if (DaringTimer <= diff) { DoCast(me, SPELL_DARING); - DaringTimer = urand(20000,40000); + DaringTimer = urand(20000, 40000); } else DaringTimer -= diff; if (DeadlySwatheTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DEADLY_SWATHE); - DeadlySwatheTimer = urand(15000,25000); + DeadlySwatheTimer = urand(15000, 25000); } else DeadlySwatheTimer -= diff; if (PoisonThrustTimer <= diff) { DoCast(me->getVictim(), SPELL_POISON_THRUST); - PoisonThrustTimer = urand(10000,20000); + PoisonThrustTimer = urand(10000, 20000); } else PoisonThrustTimer -= diff; DoMeleeAttackIfReady(); @@ -1412,31 +1412,31 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_BLINDING_PASSION); - BlindingPassionTimer = urand(30000,45000); + BlindingPassionTimer = urand(30000, 45000); } else BlindingPassionTimer -= diff; if (DevotionTimer <= diff) { DoCast(me, SPELL_DEVOTION); - DevotionTimer = urand(15000,45000); + DevotionTimer = urand(15000, 45000); } else DevotionTimer -= diff; if (PowerfulAttractionTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION); - PowerfulAttractionTimer = urand(5000,30000); + PowerfulAttractionTimer = urand(5000, 30000); } else PowerfulAttractionTimer -= diff; if (EternalAffectionTimer <= diff) { - if (urand(0,1) && SummonedRomulo) + if (urand(0, 1) && SummonedRomulo) { Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID)); if (Romulo && Romulo->isAlive() && !RomuloDead) DoCast(Romulo, SPELL_ETERNAL_AFFECTION); } else DoCast(me, SPELL_ETERNAL_AFFECTION); - EternalAffectionTimer = urand(45000,60000); + EternalAffectionTimer = urand(45000, 60000); } else EternalAffectionTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 93ce549c291..2b0806f9e5e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -84,7 +84,7 @@ public: memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); // 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered. - m_uiOperaEvent = urand(1,3); + m_uiOperaEvent = urand(1, 3); m_uiOzDeathCount = 0; m_uiCurtainGUID = 0; @@ -149,7 +149,7 @@ public: case TYPE_NETHERSPITE: m_auiEncounter[8] = uiData; break; case TYPE_CHESS: if (uiData == DONE) - DoRespawnGameObject(DustCoveredChest,DAY); + DoRespawnGameObject(DustCoveredChest, DAY); m_auiEncounter[9] = uiData; break; case TYPE_MALCHEZZAR: m_auiEncounter[10] = uiData; break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 92a63a37b3e..9d643667e7b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -342,17 +342,17 @@ public: case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_OZ; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", pPlayer->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_HOOD; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", pPlayer->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->CLOSE_GOSSIP_MENU(); pBarnesAI->m_uiEventId = EVENT_RAJ; - sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID()); + sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", pPlayer->GetGUID()); break; } @@ -375,7 +375,7 @@ public: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); } - if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI,pCreature->AI())) + if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI())) { if (!pBarnesAI->RaidWiped) pPlayer->SEND_GOSSIP_MENU(8970, pCreature->GetGUID()); @@ -459,8 +459,8 @@ public: #define SPELL_CONFLAGRATION_BLAST 30977 #define SPELL_MANA_SHIELD 31635 -static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f}; -static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f}; +static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; +static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; class npc_image_of_medivh : public CreatureScript { @@ -497,11 +497,11 @@ public: if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0) { pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID()); - (*me).GetMotionMaster()->MovePoint(1,MedivPos[0],MedivPos[1],MedivPos[2]); + (*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]); Step = 0; }else { - me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); } } @@ -523,12 +523,12 @@ public: { Step = 1; EventStarted = true; - Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); if (!Arcanagos) return; ArcanagosGUID = Arcanagos->GetGUID(); Arcanagos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - (*Arcanagos).GetMotionMaster()->MovePoint(0,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2]); + (*Arcanagos).GetMotionMaster()->MovePoint(0, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2]); Arcanagos->SetOrientation(ArcanagosPos[3]); me->SetOrientation(MedivPos[3]); YellTimer = 10000; @@ -536,7 +536,7 @@ public: uint32 NextStep(uint32 Step) { - Unit* arca = Unit::GetUnit((*me),ArcanagosGUID); + Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); Map* pMap = me->GetMap(); switch(Step) { @@ -581,7 +581,7 @@ public: CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, 0); return 5000; case 12: - arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f); + arca->GetMotionMaster()->MovePoint(0, -11010.82f, -1761.18f, 156.47f); arca->setActive(true); arca->InterruptNonMeleeSpells(true); arca->SetSpeed(MOVE_FLIGHT, 2.0f); @@ -607,7 +607,7 @@ public: } return 50000; case 15: - arca->DealDamage(arca,arca->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + arca->DealDamage(arca, arca->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return 5000; default : return 9999999; } @@ -625,7 +625,7 @@ public: if (Step >= 7 && Step <= 12) { - Unit* arca = Unit::GetUnit((*me),ArcanagosGUID); + Unit* arca = Unit::GetUnit((*me), ArcanagosGUID); if (FireArcanagosTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 7c1815dec4f..9d0c540223d 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -296,15 +296,15 @@ public: if (FireballTimer <= diff) { DoCast(me->getVictim(), SPELL_FIREBALL_NORMAL); - FireballTimer = urand(2000,6000); + FireballTimer = urand(2000, 6000); } else FireballTimer -= diff; if (PhoenixTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); - uint8 random = urand(1,2); + uint8 random = urand(1, 2); float x = KaelLocations[random][0]; float y = KaelLocations[random][1]; @@ -330,7 +330,7 @@ public: DoCast(pTarget, SPELL_FLAMESTRIKE3, true); DoScriptText(SAY_FLAMESTRIKE, me); } - FlameStrikeTimer = urand(15000,25000); + FlameStrikeTimer = urand(15000, 25000); } else FlameStrikeTimer -= diff; // Below 50% @@ -396,7 +396,7 @@ public: for (uint8 i = 0; i < 3; ++i) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Orb && pTarget) @@ -535,7 +535,7 @@ public: me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->ClearAllReactives(); - me->SetUInt64Value(UNIT_FIELD_TARGET,0); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -580,7 +580,7 @@ public: if (BurnTimer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. - uint16 dmg = urand(1650,2050); + uint16 dmg = urand(1650, 2050); me->DealDamage(me, dmg, 0, DOT, SPELL_SCHOOL_MASK_FIRE, NULL, false); BurnTimer += 2000; } BurnTimer -= diff; @@ -648,7 +648,7 @@ public: void Reset() { DespawnTimer = 30000; - ChangeTargetTimer = urand(6000,12000); + ChangeTargetTimer = urand(6000, 12000); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -678,7 +678,7 @@ public: AttackStart(pTarget); } - ChangeTargetTimer = urand(5000,15000); + ChangeTargetTimer = urand(5000, 15000); } else ChangeTargetTimer -= diff; } }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 5f9f850ceaf..cc17f4b15af 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -274,7 +274,7 @@ public: { Unit *pTarget = me; - if (urand(0,1)) + if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) pTarget = pAdd; @@ -287,7 +287,7 @@ public: { Unit *pTarget = me; - if (urand(0,1)) + if (urand(0, 1)) if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD)) pTarget = pAdd; @@ -300,11 +300,11 @@ public: { Unit *pTarget = NULL; - if (urand(0,1)) + if (urand(0, 1)) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); else { - if (urand(0,1)) + if (urand(0, 1)) pTarget = me; else if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) @@ -362,7 +362,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI // For later development, some alternative threat system should be made // We do not know what this system is based upon, but one theory is class (healers=high threat, dps=medium, etc) // We reset their threat frequently as an alternative until such a system exist - ResetThreatTimer = urand(5000,20000); + ResetThreatTimer = urand(5000, 20000); // in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her) if (Creature* pDelrissa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DELRISSA) : 0)) @@ -1025,7 +1025,7 @@ public: Wing_Clip_Timer = 4000; Freezing_Trap_Timer = 15000; - Unit* pPet = Unit::GetUnit(*me,m_uiPetGUID); + Unit* pPet = Unit::GetUnit(*me, m_uiPetGUID); if (!pPet) me->SummonCreature(NPC_SLIVER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -1155,7 +1155,7 @@ public: if (Totem_Timer <= diff) { - DoCast(me, RAND(SPELL_WINDFURY_TOTEM,SPELL_FIRE_NOVA_TOTEM,SPELL_EARTHBIND_TOTEM)); + DoCast(me, RAND(SPELL_WINDFURY_TOTEM, SPELL_FIRE_NOVA_TOTEM, SPELL_EARTHBIND_TOTEM)); ++Totem_Amount; Totem_Timer = Totem_Amount*2000; } else Totem_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 65ac5aff16a..384b4f6e664 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -203,7 +203,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void MovementInform(uint32 type, uint32 id) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 42c20299b38..cd7eb6e9015 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -118,10 +118,10 @@ public: void JustSummoned(Creature *summoned) { if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) - summoned->GetMotionMaster()->MoveFollow(temp,0,0); + summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); //spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok - summoned->CastSpell(summoned,SPELL_ENERGY_BOLT,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_ENERGY_BOLT, false, 0, 0, me->GetGUID()); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 309a1546ca3..a205b3e5ad8 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -209,7 +209,7 @@ class boss_ragnaros : public CreatureScript break; case EVENT_HAND_OF_RAGNAROS: DoCast(me, SPELL_HAND_OF_RAGNAROS); - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_HAND, me); events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20000); break; @@ -260,7 +260,7 @@ class boss_ragnaros : public CreatureScript // summon 8 elementals for (uint8 i = 0; i < 8; ++i) if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000)) + if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) pSummoned->AI()->AttackStart(pTarget); _hasSubmergedOnce = true; @@ -275,7 +275,7 @@ class boss_ragnaros : public CreatureScript for (uint8 i = 0; i < 8; ++i) if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000)) + if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) pSummoned->AI()->AttackStart(pTarget); _isBanished = true; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp index 70437b9e62e..d4f746b0cb3 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp @@ -56,8 +56,8 @@ public: ai->Spell[0].First_Cast = 10000; ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - uint32 RandDebuff = RAND(SPELL_GROUND_STOMP,SPELL_ANCIENT_DREAD,SPELL_CAUTERIZING_FLAMES, - SPELL_WITHERING_HEAT,SPELL_ANCIENT_DESPAIR,SPELL_ANCIENT_HYSTERIA); + uint32 RandDebuff = RAND(SPELL_GROUND_STOMP, SPELL_ANCIENT_DREAD, SPELL_CAUTERIZING_FLAMES, + SPELL_WITHERING_HEAT, SPELL_ANCIENT_DESPAIR, SPELL_ANCIENT_HYSTERIA); ai->Spell[1].Enabled = true; ai->Spell[1].Spell_Id = RandDebuff; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 5f74f998f95..c046b6a3a88 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -43,17 +43,17 @@ enum eDeathKnightSpells #define EVENT_BLOOD_STRIKE 3 #define EVENT_DEATH_COIL 4 -//used by 29519,29520,29565,29566,29567 but signed for 29519 +//used by 29519, 29520, 29565, 29566, 29567 but signed for 29519 int32 say_event_start[8] = { - -1609000,-1609001,-1609002,-1609003, - -1609004,-1609005,-1609006,-1609007 + -1609000, -1609001, -1609002, -1609003, + -1609004, -1609005, -1609006, -1609007 }; int32 say_event_attack[9] = { - -1609008,-1609009,-1609010,-1609011,-1609012, - -1609013,-1609014,-1609015,-1609016 + -1609008, -1609009, -1609010, -1609011, -1609012, + -1609013, -1609014, -1609015, -1609016 }; uint32 acherus_soul_prison[12] = @@ -192,7 +192,7 @@ public: for (uint8 i = 0; i < 12; ++i) { - if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i],30)) + if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i], 30)) { if (me->IsWithinDist(temp_prison, dist, false)) { @@ -401,7 +401,7 @@ public: return true; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature),pCreature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); } return true; } @@ -787,14 +787,14 @@ public: // Ghouls should display their Birth Animation // Crawling out of the ground //DoCast(me, 35177, true); - //me->MonsterSay("Mommy?",LANG_UNIVERSAL,0); + //me->MonsterSay("Mommy?", LANG_UNIVERSAL, 0); me->SetReactState(REACT_DEFENSIVE); } void FindMinions(Unit *owner) { std::list<Creature*> MinionList; - owner->GetAllMinionsByEntry(MinionList,GHOULS); + owner->GetAllMinionsByEntry(MinionList, GHOULS); if (!MinionList.empty()) { @@ -959,7 +959,7 @@ public: AddWaypoint(11, 2202.595947f, -6061.325684f, 5.882018f); AddWaypoint(12, 2188.974609f, -6080.866699f, 3.370027f); - if (urand(0,1)) + if (urand(0, 1)) { AddWaypoint(13, 2176.483887f, -6110.407227f, 1.855181f); AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f); @@ -995,7 +995,7 @@ public: me->SetInFront(car); me->SendMovementFlagUpdate(); } - me->MonsterSay(SAY_SCARLET_MINER1,LANG_UNIVERSAL,0); + me->MonsterSay(SAY_SCARLET_MINER1, LANG_UNIVERSAL, 0); SetRun(true); IntroTimer = 4000; IntroPhase = 1; @@ -1009,7 +1009,7 @@ public: car->SendMonsterStop(); car->RemoveAura(SPELL_CART_DRAG); } - me->MonsterSay(SAY_SCARLET_MINER2,LANG_UNIVERSAL,0); + me->MonsterSay(SAY_SCARLET_MINER2, LANG_UNIVERSAL, 0); break; default: break; @@ -1059,7 +1059,7 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); if (Creature *car = pPlayer->GetVehicleCreatureBase()) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index fac16df491e..f30d0be1f74 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -19,7 +19,7 @@ #include "ScriptedEscortAI.h" //How to win friends and influence enemies -// texts signed for creature 28939 but used for 28939,28940,28610 +// texts signed for creature 28939 but used for 28939, 28940, 28610 enum win_friends { SAY_PERSUADE1 = -1609501, @@ -86,12 +86,12 @@ public: me->SetReactState(REACT_PASSIVE); DoCastAOE(58111, true); - DoScriptText(RAND(SAY_PERSUADE1,SAY_PERSUADE2,SAY_PERSUADE3, - SAY_PERSUADE4,SAY_PERSUADE5,SAY_PERSUADE6, + DoScriptText(RAND(SAY_PERSUADE1, SAY_PERSUADE2, SAY_PERSUADE3, + SAY_PERSUADE4, SAY_PERSUADE5, SAY_PERSUADE6, SAY_PERSUADE7), caster); - DoScriptText(RAND(SAY_CRUSADER1,SAY_CRUSADER2,SAY_CRUSADER3, - SAY_CRUSADER4,SAY_CRUSADER5,SAY_CRUSADER6), me); + DoScriptText(RAND(SAY_CRUSADER1, SAY_CRUSADER2, SAY_CRUSADER3, + SAY_CRUSADER4, SAY_CRUSADER5, SAY_CRUSADER6), me); } } } @@ -183,7 +183,7 @@ public: { pCreature->SetStandState(UNIT_STAND_STATE_STAND); - if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI,pCreature->AI())) + if (npc_escortAI* pEscortAI = CAST_AI(npc_koltira_deathweaver::npc_koltira_deathweaverAI, pCreature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID()); } return true; @@ -505,7 +505,7 @@ public: void Shout() { if (rand()%100 < 15) - DoScriptText(RAND(SAY_VALROTH3,SAY_VALROTH4,SAY_VALROTH5), me); + DoScriptText(RAND(SAY_VALROTH3, SAY_VALROTH4, SAY_VALROTH5), me); } void JustDied(Unit* killer) @@ -520,7 +520,7 @@ public: /*###### ## npc_a_special_surprise ######*/ -//used by 29032,29061,29065,29067,29068,29070,29074,29072,29073,29071 but signed for 29032 +//used by 29032, 29061, 29065, 29067, 29068, 29070, 29074, 29072, 29073, 29071 but signed for 29032 enum SpecialSurprise { SAY_EXEC_START_1 = -1609025, // speech for all diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 825f115b973..fb98668f3f7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -243,7 +243,7 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* pPlayer = itr->getSource()) - pPlayer->SendUpdateWorldState(id,state); + pPlayer->SendUpdateWorldState(id, state); } } } @@ -377,11 +377,11 @@ public: uiTotal_scourge = ENCOUNTER_TOTAL_SCOURGE; uiSummon_counter = 0; - uiAnti_magic_zone = urand(1000,6000); - uiDeath_strike = urand(5000,10000); - uiDeath_embrace = urand(5000,10000); - uiIcy_touch = urand(5000,10000); - uiUnholy_blight = urand(5000,10000); + uiAnti_magic_zone = urand(1000, 6000); + uiDeath_strike = urand(5000, 10000); + uiDeath_embrace = urand(5000, 10000); + uiIcy_touch = urand(5000, 10000); + uiUnholy_blight = urand(5000, 10000); uiFight_speech = 15000; uiSpawncheck = 1000; @@ -1381,11 +1381,11 @@ public: if (uiFight_speech <= diff) { - DoScriptText(RAND(SAY_LIGHT_OF_DAWN09,SAY_LIGHT_OF_DAWN10,SAY_LIGHT_OF_DAWN11, - SAY_LIGHT_OF_DAWN12,SAY_LIGHT_OF_DAWN13,SAY_LIGHT_OF_DAWN14, - SAY_LIGHT_OF_DAWN15,SAY_LIGHT_OF_DAWN16,SAY_LIGHT_OF_DAWN17, - SAY_LIGHT_OF_DAWN18,SAY_LIGHT_OF_DAWN19,SAY_LIGHT_OF_DAWN20, - SAY_LIGHT_OF_DAWN21,SAY_LIGHT_OF_DAWN22,SAY_LIGHT_OF_DAWN23, + DoScriptText(RAND(SAY_LIGHT_OF_DAWN09, SAY_LIGHT_OF_DAWN10, SAY_LIGHT_OF_DAWN11, + SAY_LIGHT_OF_DAWN12, SAY_LIGHT_OF_DAWN13, SAY_LIGHT_OF_DAWN14, + SAY_LIGHT_OF_DAWN15, SAY_LIGHT_OF_DAWN16, SAY_LIGHT_OF_DAWN17, + SAY_LIGHT_OF_DAWN18, SAY_LIGHT_OF_DAWN19, SAY_LIGHT_OF_DAWN20, + SAY_LIGHT_OF_DAWN21, SAY_LIGHT_OF_DAWN22, SAY_LIGHT_OF_DAWN23, SAY_LIGHT_OF_DAWN24), me); uiFight_speech = 15000 + rand()%5000; } else uiFight_speech -= diff; @@ -1535,7 +1535,7 @@ public: { if (Creature* pTemp = Unit::GetCreature(*me, ui_GUID)) if (pTemp->isAlive()) - if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarger->isAlive()) { // pTemp->DeleteThreatList(); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp index dff84c6f700..d9c22780be4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp @@ -77,7 +77,7 @@ public: FlyBackTimer = 500; break; case 1: - plr->GetClosePoint(x,y,z, me->GetObjectSize()); + plr->GetClosePoint(x, y, z, me->GetObjectSize()); z += 2.5; x -= 2; y -= 1.5; me->GetMotionMaster()->MovePoint(0, x, y, z); me->SetUInt64Value(UNIT_FIELD_TARGET, plr->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 5895d43f5c2..6b0ddf80096 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -101,7 +101,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 9e9d6ecb287..3b5c3a064d4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -89,33 +89,33 @@ struct Locations static Locations FlightPoint[]= { - {1754.00f,1346.00f,17.50f}, - {1765.00f,1347.00f,19.00f}, - {1784.00f,1346.80f,25.40f}, - {1803.30f,1347.60f,33.00f}, - {1824.00f,1350.00f,42.60f}, - {1838.80f,1353.20f,49.80f}, - {1852.00f,1357.60f,55.70f}, - {1861.30f,1364.00f,59.40f}, - {1866.30f,1374.80f,61.70f}, - {1864.00f,1387.30f,63.20f}, - {1854.80f,1399.40f,64.10f}, - {1844.00f,1406.90f,64.10f}, - {1824.30f,1411.40f,63.30f}, - {1801.00f,1412.30f,60.40f}, - {1782.00f,1410.10f,55.50f}, - {1770.50f,1405.20f,50.30f}, - {1765.20f,1400.70f,46.60f}, - {1761.40f,1393.40f,41.70f}, - {1759.10f,1386.70f,36.60f}, - {1757.80f,1378.20f,29.00f}, - {1758.00f,1367.00f,19.51f} + {1754.00f, 1346.00f, 17.50f}, + {1765.00f, 1347.00f, 19.00f}, + {1784.00f, 1346.80f, 25.40f}, + {1803.30f, 1347.60f, 33.00f}, + {1824.00f, 1350.00f, 42.60f}, + {1838.80f, 1353.20f, 49.80f}, + {1852.00f, 1357.60f, 55.70f}, + {1861.30f, 1364.00f, 59.40f}, + {1866.30f, 1374.80f, 61.70f}, + {1864.00f, 1387.30f, 63.20f}, + {1854.80f, 1399.40f, 64.10f}, + {1844.00f, 1406.90f, 64.10f}, + {1824.30f, 1411.40f, 63.30f}, + {1801.00f, 1412.30f, 60.40f}, + {1782.00f, 1410.10f, 55.50f}, + {1770.50f, 1405.20f, 50.30f}, + {1765.20f, 1400.70f, 46.60f}, + {1761.40f, 1393.40f, 41.70f}, + {1759.10f, 1386.70f, 36.60f}, + {1757.80f, 1378.20f, 29.00f}, + {1758.00f, 1367.00f, 19.51f} }; static Locations Spawn[]= { - {1776.27f,1348.74f,19.20f}, //spawn point for pumpkin shrine mob - {1765.28f,1347.46f,17.55f} //spawn point for smoke + {1776.27f, 1348.74f, 19.20f}, //spawn point for pumpkin shrine mob + {1765.28f, 1347.46f, 17.55f} //spawn point for smoke }; static const char* Text[]= @@ -245,7 +245,7 @@ public: die = false; withbody = true; wait = 1000; - laugh = urand(15000,30000); + laugh = urand(15000, 30000); } void EnterCombat(Unit * /*who*/) {} @@ -253,13 +253,13 @@ public: { DoScriptText(textEntry, me, pTarget); //DoCast(me, SPELL_HEAD_SPEAKS, true); - Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); + Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) - speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); + speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); laugh += 3000; } - void DamageTaken(Unit* /*done_by*/,uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { if (withbody) return; @@ -327,13 +327,13 @@ public: if (laugh <= diff) { - laugh = urand(15000,30000); - DoPlaySoundToSet(me, RandomLaugh[urand(0,2)]); + laugh = urand(15000, 30000); + DoPlaySoundToSet(me, RandomLaugh[urand(0, 2)]); //DoCast(me, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head" - Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); + Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) - speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); - me->MonsterTextEmote(EMOTE_LAUGHS,0); + speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); + me->MonsterTextEmote(EMOTE_LAUGHS, 0); } else laugh -= diff; } else @@ -400,7 +400,7 @@ public: Phase = 1; conflagrate = 15000; summonadds = 15000; - laugh = urand(16000,20000); + laugh = urand(16000, 20000); cleave = 2000; regen = 1000; burn = 6000; @@ -429,7 +429,7 @@ public: me->SetVisible(false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_LEVITATING); - me->SetSpeed(MOVE_WALK,5.0f,true); + me->SetSpeed(MOVE_WALK, 5.0f, true); wp_reached = false; count = 0; say_timer = 3000; @@ -451,7 +451,7 @@ public: break; case 1: { - if (Creature *smoke = me->SummonCreature(HELPER,Spawn[1].x,Spawn[1].y,Spawn[1].z,0,TEMPSUMMON_TIMED_DESPAWN,20000)) + if (Creature *smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3); DoCast(me, SPELL_RHYME_BIG); break; @@ -470,7 +470,7 @@ public: wp_reached = false; me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); SaySound(SAY_ENTRANCE); - if (Unit *plr = Unit::GetUnit((*me),PlayerGUID)) + if (Unit *plr = Unit::GetUnit((*me), PlayerGUID)) DoStartMovement(plr); break; } @@ -537,7 +537,7 @@ public: void SpellHitTarget(Unit* unit, const SpellEntry* spell) { if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION)) - SaySound(SAY_CONFLAGRATION,unit); + SaySound(SAY_CONFLAGRATION, unit); } void JustDied(Unit* /*killer*/) @@ -545,9 +545,9 @@ public: me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); SaySound(SAY_DEATH); - if (Creature *flame = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000)) - flame->CastSpell(flame,SPELL_BODY_FLAME,false); - if (Creature *wisp = DoSpawnCreature(WISP_INVIS,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature *flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) + flame->CastSpell(flame, SPELL_BODY_FLAME, false); + if (Creature *wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4); if (pInstance) pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); @@ -571,14 +571,14 @@ public: SaySound(SAY_REJOINED); DoCast(me, SPELL_HEAD); caster->GetMotionMaster()->Clear(false); - caster->GetMotionMaster()->MoveFollow(me,6,float(urand(0,5))); + caster->GetMotionMaster()->MoveFollow(me, 6, float(urand(0, 5))); //DoResetThreat();//not sure if need 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)); + me->AddThreat(pUnit, caster->getThreatManager().getThreat(pUnit)); } } } @@ -594,19 +594,19 @@ public: me->SetName("Headless Horseman, Unhorsed"); if (!headGUID) - headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6),0,0,TEMPSUMMON_DEAD_DESPAWN,0)->GetGUID(); + headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID(); Unit* Head = Unit::GetUnit((*me), headGUID); if (Head && Head->isAlive()) { Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - //Head->CastSpell(Head,SPELL_HEAD_INVIS,false); + //Head->CastSpell(Head, SPELL_HEAD_INVIS, false); me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_IMMUNE, true); DoCast(me, SPELL_BODY_REGEN, true); DoCast(Head, SPELL_FLYING_HEAD, true); DoCast(me, SPELL_CONFUSE, false); //test - done_by->ProcDamageAndSpell(me,PROC_FLAG_KILL,PROC_FLAG_KILLED,PROC_EX_NONE,0); - whirlwind = urand(4000,8000); + done_by->ProcDamageAndSpell(me, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0); + whirlwind = urand(4000, 8000); regen = 0; } } @@ -653,7 +653,7 @@ public: { wp_reached = false; me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MovePoint(id,FlightPoint[id].x,FlightPoint[id].y,FlightPoint[id].z); + me->GetMotionMaster()->MovePoint(id, FlightPoint[id].x, FlightPoint[id].y, FlightPoint[id].z); } } } @@ -663,7 +663,7 @@ public: break; if (burn <= diff) { - if (Creature *flame = me->SummonCreature(HELPER,Spawn[0].x,Spawn[0].y,Spawn[0].z,0,TEMPSUMMON_TIMED_DESPAWN,17000)) + if (Creature *flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); burned = true; } else burn -= diff; @@ -673,7 +673,7 @@ public: { if (Unit *plr = SelectRandomPlayer(30.0f)) DoCast(plr, SPELL_CONFLAGRATION, false); - conflagrate = urand(10000,16000); + conflagrate = urand(10000, 16000); } else conflagrate -= diff; break; case 3: @@ -682,15 +682,15 @@ public: me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_SUMMON_PUMPKIN); SaySound(SAY_SPROUTING_PUMPKINS); - summonadds = urand(25000,35000); + summonadds = urand(25000, 35000); } else summonadds -= diff; break; } if (laugh <= diff) { - laugh = urand(11000,22000); - me->MonsterTextEmote(EMOTE_LAUGHS,0); + laugh = urand(11000, 22000); + me->MonsterTextEmote(EMOTE_LAUGHS, 0); DoPlaySoundToSet(me, RandomLaugh[rand()%3]); } else laugh -= diff; @@ -700,7 +700,7 @@ public: if (cleave <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - cleave = urand(2000,6000); //1 cleave per 2.0f-6.0fsec + cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec } else cleave -= diff; } } @@ -728,8 +728,8 @@ public: if (whirlwind <= diff) { - whirlwind = urand(4000,8000); - if (urand(0,1)) + whirlwind = urand(4000, 8000); + if (urand(0, 1)) { me->RemoveAurasDueToSpell(SPELL_CONFUSE); DoCast(me, SPELL_WHIRLWIND, true); @@ -764,20 +764,20 @@ public: { float x, y, z; me->GetPosition(x, y, z); //this visual aura some under ground - me->GetMap()->CreatureRelocation(me, x,y,z + 0.35f, 0.0f); + me->GetMap()->CreatureRelocation(me, x, y, z + 0.35f, 0.0f); Despawn(); - Creature *debuff = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,14500); + Creature *debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500); if (debuff) { debuff->SetDisplayId(me->GetDisplayId()); - debuff->CastSpell(debuff,SPELL_PUMPKIN_AURA_GREEN,false); + debuff->CastSpell(debuff, SPELL_PUMPKIN_AURA_GREEN, false); CAST_AI(mob_wisp_invis::mob_wisp_invisAI, debuff->AI())->SetType(1); debuffGUID = debuff->GetGUID(); } sprouted = false; DoCast(me, SPELL_PUMPKIN_AURA, true); DoCast(me, SPELL_SPROUTING); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } void EnterCombat(Unit * /*who*/){} @@ -788,7 +788,7 @@ public: { sprouted = true; me->RemoveAllAuras(); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); DoCast(me, SPELL_SPROUT_BODY, true); me->UpdateEntry(PUMPKIN_FIEND); DoStartMovement(me->getVictim()); @@ -798,7 +798,7 @@ public: void Despawn() { if (!debuffGUID) return; - Unit *debuff = Unit::GetUnit((*me),debuffGUID); + Unit *debuff = Unit::GetUnit((*me), debuffGUID); if (debuff) debuff->SetVisible(false); debuffGUID = 0; @@ -811,7 +811,7 @@ public: if (!who || !who->isTargetableForAttack() || !me->IsHostileTo(who) || me->getVictim()) return; - me->AddThreat(who,0.0f); + me->AddThreat(who, 0.0f); if (sprouted) DoStartMovement(who); } @@ -847,7 +847,7 @@ public: if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64) { */ pPlayer->AreaExploredOrEventHappens(11405); - if (Creature *horseman = soil->SummonCreature(HH_MOUNTED,FlightPoint[20].x,FlightPoint[20].y,FlightPoint[20].z,0,TEMPSUMMON_MANUAL_DESPAWN,0)) + if (Creature *horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) { CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID(); CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 526a9210eb0..a97377f9d01 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -132,7 +132,7 @@ public: { mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) { - Start_Timer = urand(1000,6000); + Start_Timer = urand(1000, 6000); } uint32 Start_Timer; @@ -147,7 +147,7 @@ public: { if (Start_Timer <= diff) { - Start(true,true); + Start(true, true); Start_Timer = 0; } else Start_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index 565b183c7ea..be37b82e8b0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -87,7 +87,7 @@ public: //Fear_Timer if (Fear_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 40000; @@ -96,7 +96,7 @@ public: //Sleep_Timer if (Sleep_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0)) DoCast(pTarget, SPELL_SLEEP); Sleep_Timer = 30000; @@ -112,7 +112,7 @@ public: //Dispel_Timer if (Dispel_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 5bd2193f296..eb7ffbc111a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -81,7 +81,7 @@ public: return; //Any other actions to do with vorrel? setStandState? - if (Unit *vorrel = Unit::GetUnit(*me,pInstance->GetData64(DATA_VORREL))) + if (Unit *vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL))) DoScriptText(SAY_TRIGGER_VORREL, vorrel); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 33d2b16bf42..fd44a9bfe54 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -91,7 +91,7 @@ public: if (m_pInstance) if (me->isAlive()) - m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT,NOT_STARTED); + m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); m_bHasDied = false; m_bHeal = false; @@ -133,7 +133,7 @@ public: { m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS); - Whitemane->GetMotionMaster()->MovePoint(1,1163.113370f,1398.856812f,32.527786f); + Whitemane->GetMotionMaster()->MovePoint(1, 1163.113370f, 1398.856812f, 32.527786f); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MoveIdle(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 15c759b6ab4..eff0adccffb 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -125,7 +125,7 @@ public: if (Teleport_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { if (DoGetThreat(pTarget)) @@ -135,80 +135,80 @@ public: switch(rand()%6) { case 0: - DoTeleportPlayer(pTarget, 250.0696f,0.3921f,84.8408f,3.149f); - Summoned = me->SummonCreature(16119,254.2325f,0.3417f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 84.8408f, 3.149f); + Summoned = me->SummonCreature(16119, 254.2325f, 0.3417f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133f,4.0226f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 257.7133f, 4.0226f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702f,-2.60656f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 258.6702f, -2.60656f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,84.8410f,1.608f); - Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 84.8410f, 1.608f); + Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 84.8407f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget, 95.1547f,-1.8173f,85.2289f,0.043f); - Summoned = me->SummonCreature(16119,100.9404f,-1.8016f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 95.1547f, -1.8173f, 85.2289f, 0.043f); + Summoned = me->SummonCreature(16119, 100.9404f, -1.8016f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.3729f,0.4882f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 101.3729f, 0.4882f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.4596f,-4.4740f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 101.4596f, -4.4740f, 85.2289f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 3: - DoTeleportPlayer(pTarget, 250.0696f,0.3921f,72.6722f,3.149f); - Summoned = me->SummonCreature(16119,240.34481f,0.7368f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f, 0.3921f, 72.6722f, 3.149f); + Summoned = me->SummonCreature(16119, 240.34481f, 0.7368f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.3633f,-2.9520f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 240.3633f, -2.9520f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.6702f,3.34949f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 240.6702f, 3.34949f, 72.6722f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 4: - DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,70.7734f,1.608f); - Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f, -91.9481f, 70.7734f, 1.608f); + Summoned = me->SummonCreature(16119, 184.0519f, -73.5649f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 179.5951f, -73.7045f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 180.6452f, -78.2143f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 283.2274f, -78.1518f, 70.7734f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 5: - DoTeleportPlayer(pTarget, 106.1541f,-1.8994f,75.3663f,0.043f); - Summoned = me->SummonCreature(16119,115.3945f,-1.5555f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 106.1541f, -1.8994f, 75.3663f, 0.043f); + Summoned = me->SummonCreature(16119, 115.3945f, -1.5555f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133f,1.8066f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 257.7133f, 1.8066f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702f,-5.1001f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119, 258.6702f, -5.1001f, 75.3663f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index cd17ef2125c..9009cdcd1c2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -90,7 +90,7 @@ public: if (ShadowShock_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); ShadowShock_Timer = 12000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 9f2a7fd5428..467c4f1cd18 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -97,7 +97,7 @@ public: if (Corruption_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); Corruption_Timer = 24000; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index e01b0fb5664..39f491d779f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -65,7 +65,7 @@ public: void SummonIllusions(Unit* victim) { - if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + if (Creature *Illusion = DoSpawnCreature(11439, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) Illusion->AI()->AttackStart(victim); } @@ -108,13 +108,13 @@ public: me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetDisplayId(11686); // Invisible Model - DoModifyThreatPercent(me->getVictim(),-99); + DoModifyThreatPercent(me->getVictim(), -99); //Summon 10 Illusions attacking random gamers Unit *pTarget = NULL; for (uint8 i = 0; i < 10; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) SummonIllusions(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index f2b977933f7..b104a0a9b4c 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -63,13 +63,13 @@ public: void SummonMinions(Unit* victim) { - if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMinion->AI()->AttackStart(victim); } void SummonMages(Unit* victim) { - if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + if (Creature *SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) SummonedMage->AI()->AttackStart(victim); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index f4d86668dde..e5bf50b6162 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -79,7 +79,7 @@ public: if (Immolate_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 12000; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 5dc95e3eba7..deef5178d02 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -48,11 +48,11 @@ enum eEnums const Position SpawnLocation[] = { - {-148.199f,2165.647f,128.448f,1.026f}, - {-153.110f,2168.620f,128.448f,1.026f}, - {-145.905f,2180.520f,128.448f,4.183f}, - {-140.794f,2178.037f,128.448f,4.090f}, - {-138.640f,2170.159f,136.577f,2.737f} + {-148.199f, 2165.647f, 128.448f, 1.026f}, + {-153.110f, 2168.620f, 128.448f, 1.026f}, + {-145.905f, 2180.520f, 128.448f, 4.183f}, + {-140.794f, 2178.037f, 128.448f, 4.090f}, + {-138.640f, 2170.159f, 136.577f, 2.737f} }; class instance_shadowfang_keep : public InstanceMapScript { @@ -137,8 +137,8 @@ public: if (pAda && pAda->isAlive() && pAsh && pAsh->isAlive()) { - DoScriptText(SAY_BOSS_DIE_AD,pAda); - DoScriptText(SAY_BOSS_DIE_AS,pAsh); + DoScriptText(SAY_BOSS_DIE_AD, pAda); + DoScriptText(SAY_BOSS_DIE_AS, pAsh); } } @@ -251,19 +251,19 @@ public: switch(uiPhase) { case 1: - pSummon = pArchmage->SummonCreature(pArchmage->GetEntry(),SpawnLocation[4],TEMPSUMMON_TIMED_DESPAWN,10000); + pSummon = pArchmage->SummonCreature(pArchmage->GetEntry(), SpawnLocation[4], TEMPSUMMON_TIMED_DESPAWN, 10000); pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); pSummon->SetReactState(REACT_DEFENSIVE); - pSummon->CastSpell(pSummon,SPELL_ASHCROMBE_TELEPORT,true); - DoScriptText(SAY_ARCHMAGE,pSummon); + pSummon->CastSpell(pSummon, SPELL_ASHCROMBE_TELEPORT, true); + DoScriptText(SAY_ARCHMAGE, pSummon); uiTimer = 2000; uiPhase = 2; break; case 2: - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[0],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[1],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[2],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER,SpawnLocation[3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[1], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + pArchmage->SummonCreature(NPC_ARUGAL_VOIDWALKER, SpawnLocation[3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); uiPhase = 0; break; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 169e8d63a8f..e1f8ee39ae1 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -164,7 +164,7 @@ public: void Reset() { - uiDarkOffering = urand(290,10); + uiDarkOffering = urand(290, 10); } void UpdateAI(uint32 const uiDiff) @@ -174,14 +174,14 @@ public: if (uiDarkOffering <= uiDiff) { - if (Creature* pFriend = me->FindNearestCreature(me->GetEntry(),25.0f,true)) + if (Creature* pFriend = me->FindNearestCreature(me->GetEntry(), 25.0f, true)) { if (pFriend) - DoCast(pFriend,SPELL_DARK_OFFERING); + DoCast(pFriend, SPELL_DARK_OFFERING); } else - DoCast(me,SPELL_DARK_OFFERING); - uiDarkOffering = urand(4400,12500); + DoCast(me, SPELL_DARK_OFFERING); + uiDarkOffering = urand(4400, 12500); } else uiDarkOffering -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 9e4fc930e1c..004996845e3 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -110,26 +110,26 @@ public: // RaiseDead_Timer = 30000; SummonSkeletons_Timer = 34000; if (pInstance && pInstance->GetData(TYPE_RAMSTEIN) == DONE) - pInstance->SetData(TYPE_BARON,NOT_STARTED); + pInstance->SetData(TYPE_BARON, NOT_STARTED); } void AttackStart(Unit* who) { if (pInstance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door - pInstance->SetData(TYPE_BARON,IN_PROGRESS); + pInstance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } void JustSummoned(Creature* summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_BARON,DONE); + pInstance->SetData(TYPE_BARON, DONE); } void UpdateAI(const uint32 diff) @@ -171,12 +171,12 @@ public: //SummonSkeletons if (SummonSkeletons_Timer <= diff) { - me->SummonCreature(11197,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,29000); - me->SummonCreature(11197,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,29000); + me->SummonCreature(11197, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 29000); + me->SummonCreature(11197, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 29000); //34 seconds until we should cast this again SummonSkeletons_Timer = 40000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index b11b785154c..1dd9ecea38c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -70,7 +70,7 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_BARONESS,IN_PROGRESS); + pInstance->SetData(TYPE_BARONESS, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -112,7 +112,7 @@ public: if (rand()%100 < 65) { Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_POSSESS); } //50 seconds until we should cast this again diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 825ac9d6a81..3c24fd48010 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -105,13 +105,13 @@ public: void JustDied(Unit* /*Victim*/) { - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } void EnterCombat(Unit * /*who*/) @@ -164,49 +164,49 @@ public: switch (rand()%9) { case 0: - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 1: - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 2: - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 3: - me->SummonCreature(11054,ADD_4X,ADD_4Y,ADD_4Z,ADD_4O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_4X, ADD_4Y, ADD_4Z, ADD_4O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 4: - me->SummonCreature(11054,ADD_5X,ADD_5Y,ADD_5Z,ADD_5O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_5X, ADD_5Y, ADD_5Z, ADD_5O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 5: - me->SummonCreature(11054,ADD_6X,ADD_6Y,ADD_6Z,ADD_6O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_6X, ADD_6Y, ADD_6Z, ADD_6O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 6: - me->SummonCreature(11054,ADD_7X,ADD_7Y,ADD_7Z,ADD_7O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_7X, ADD_7Y, ADD_7Z, ADD_7O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 7: - me->SummonCreature(11054,ADD_8X,ADD_8Y,ADD_8Z,ADD_8O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_8X, ADD_8Y, ADD_8Z, ADD_8O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; case 8: - me->SummonCreature(11054,ADD_9X,ADD_9Y,ADD_9Z,ADD_9O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,240000); - me->SummonCreature(11054,ADD_3X,ADD_3Y,ADD_3Z,ADD_3O,TEMPSUMMON_TIMED_DESPAWN,240000); + me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); + me->SummonCreature(11054, ADD_3X, ADD_3Y, ADD_3Z, ADD_3O, TEMPSUMMON_TIMED_DESPAWN, 240000); break; } //30 seconds until we should cast this again diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index f15a27317d2..424602d3d5a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -186,7 +186,7 @@ public: //PsychicScream if (m_uiPsychicScream_Timer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; @@ -195,7 +195,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index be2b0aa4133..1b14261e212 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -68,7 +68,7 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_PALLID,IN_PROGRESS); + pInstance->SetData(TYPE_PALLID, IN_PROGRESS); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index af57b5941c0..36b2cfc07a6 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -70,12 +70,12 @@ public: void JustDied(Unit* /*Killer*/) { if (pInstance) - pInstance->SetData(TYPE_NERUB,IN_PROGRESS); + pInstance->SetData(TYPE_NERUB, IN_PROGRESS); } void RaiseUndeadScarab(Unit* pVictim) { - if (Creature* pUndeadScarab = DoSpawnCreature(10876, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000)) + if (Creature* pUndeadScarab = DoSpawnCreature(10876, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000)) if (pUndeadScarab->AI()) pUndeadScarab->AI()->AttackStart(pVictim); } @@ -95,7 +95,7 @@ public: //PierceArmor if (PierceArmor_Timer <= diff) { - if (urand(0,3) < 2) + if (urand(0, 3) < 2) DoCast(me->getVictim(), SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; } else PierceArmor_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 66b67a22614..714c3b81ee8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -67,7 +67,7 @@ public: { for (uint8 i = 0; i < 30; ++i) { - if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35f+irand(-10,10),-3391.87f+irand(-10,10),119.11f,5.91f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) + if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD, 3969.35f+irand(-10, 10), -3391.87f+irand(-10, 10), 119.11f, 5.91f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000)) mob->AI()->AttackStart(me->SelectNearestTarget(100.0f)); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index cdd0f8fee01..faf35185559 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -56,7 +56,7 @@ public: { if (!HasYelled) { - me->MonsterYell(SAY_SPAWN,LANG_UNIVERSAL,0); + me->MonsterYell(SAY_SPAWN, LANG_UNIVERSAL, 0); HasYelled = true; } } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index f62c197aa41..f5f407d4218 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -184,7 +184,7 @@ class instance_stratholme : public InstanceMapScript break; case GO_GAUNTLET_GATE1: //weird, but unless flag is set, client will not respond as expected. DB bug? - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_LOCKED); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); gauntletGate1GUID = go->GetGUID(); break; case GO_ZIGGURAT1: @@ -295,13 +295,13 @@ class instance_stratholme : public InstanceMapScript if (!count) { //a bit itchy, it should close the door after 10 secs, but it doesn't. skipping it for now. - //UpdateGoState(ziggurat4GUID,0,true); + //UpdateGoState(ziggurat4GUID, 0, true); if (Creature* pBaron = instance->GetCreature(baronGUID)) pBaron->SummonCreature(C_RAMSTEIN, 4032.84f, -3390.24f, 119.73f, 4.71f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: Ramstein spawned."); } else - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: %u Abomnation left to kill.",count); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Stratholme: %u Abomnation left to kill.", count); } if (data == NOT_STARTED) @@ -329,7 +329,7 @@ class instance_stratholme : public InstanceMapScript if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_DEAD_MAN_PLEA); - SetData(TYPE_BARON_RUN,DONE); + SetData(TYPE_BARON_RUN, DONE); } } if (data == DONE || data == NOT_STARTED) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 4c9f5bc2a62..4d78ef993bf 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -64,14 +64,14 @@ public: if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pGroupie->HasAura(SPELL_BARON_ULTIMATUM) && pGroupie->GetMap() == pGo->GetMap()) - pGroupie->CastSpell(pGroupie,SPELL_BARON_ULTIMATUM,true); + pGroupie->CastSpell(pGroupie, SPELL_BARON_ULTIMATUM, true); } } else if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_BARON_ULTIMATUM) && pPlayer->GetMap() == pGo->GetMap()) - pPlayer->CastSpell(pPlayer,SPELL_BARON_ULTIMATUM,true); + pPlayer->CastSpell(pPlayer, SPELL_BARON_ULTIMATUM, true); - pInstance->SetData(TYPE_BARON_RUN,IN_PROGRESS); + pInstance->SetData(TYPE_BARON_RUN, IN_PROGRESS); return false; } @@ -103,7 +103,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_ZAPPED0,SAY_ZAPPED1,SAY_ZAPPED2,SAY_ZAPPED3), me); + DoScriptText(RAND(SAY_ZAPPED0, SAY_ZAPPED1, SAY_ZAPPED2, SAY_ZAPPED3), me); } void EnterCombat(Unit* /*who*/) {} @@ -162,7 +162,7 @@ public: void JustSummoned(Creature *summoned) { - summoned->CastSpell(summoned,SPELL_SOUL_FREED,false); + summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } void JustDied(Unit* /*Killer*/) @@ -177,7 +177,7 @@ public: { if (Die_Timer <= diff) { - if (Unit* pTemp = Unit::GetUnit(*me,Tagger)) + if (Unit* pTemp = Unit::GetUnit(*me, Tagger)) { CAST_PLR(pTemp)->KilledMonsterCredit(ENTRY_RESTLESS, me->GetGUID()); me->Kill(me); @@ -237,7 +237,7 @@ public: for (uint32 i = 1; i <= 4; ++i) { //100%, 50%, 33%, 25% chance to spawn - if (urand(1,i) == 1) + if (urand(1, i) == 1) DoSummon(ENTRY_RESTLESS, me, 20.0f, 600000); } } diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index b0e8a415183..08ac34c938c 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -169,20 +169,20 @@ public: void UseStatue(GameObject* go) { - go->SummonGameObject(GO_ATALAI_LIGHT1,go->GetPositionX(),go->GetPositionY(),go->GetPositionZ(),0,0,0,0,0,0); + go->SummonGameObject(GO_ATALAI_LIGHT1, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 0, 0, 0, 0, 0); go->SetUInt32Value(GAMEOBJECT_FLAGS, 4); } /* void UseLastStatue(GameObject* go) { - AtalaiStatue1->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue1->GetPositionX(),AtalaiStatue1->GetPositionY(),AtalaiStatue1->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue2->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue2->GetPositionX(),AtalaiStatue2->GetPositionY(),AtalaiStatue2->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue3->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue3->GetPositionX(),AtalaiStatue3->GetPositionY(),AtalaiStatue3->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue4->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue4->GetPositionX(),AtalaiStatue4->GetPositionY(),AtalaiStatue4->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue5->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue5->GetPositionX(),AtalaiStatue5->GetPositionY(),AtalaiStatue5->GetPositionZ(),0,0,0,0,0,100000); - AtalaiStatue6->SummonGameObject(GO_ATALAI_LIGHT2,AtalaiStatue6->GetPositionX(),AtalaiStatue6->GetPositionY(),AtalaiStatue6->GetPositionZ(),0,0,0,0,0,100000); - go->SummonGameObject(148838,-488.997,96.61,-189.019,-1.52,0,0,0,0,100000); + AtalaiStatue1->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue1->GetPositionX(), AtalaiStatue1->GetPositionY(), AtalaiStatue1->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue2->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue2->GetPositionX(), AtalaiStatue2->GetPositionY(), AtalaiStatue2->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue3->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue3->GetPositionX(), AtalaiStatue3->GetPositionY(), AtalaiStatue3->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue4->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue4->GetPositionX(), AtalaiStatue4->GetPositionY(), AtalaiStatue4->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue5->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue5->GetPositionX(), AtalaiStatue5->GetPositionY(), AtalaiStatue5->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + AtalaiStatue6->SummonGameObject(GO_ATALAI_LIGHT2, AtalaiStatue6->GetPositionX(), AtalaiStatue6->GetPositionY(), AtalaiStatue6->GetPositionZ(), 0, 0, 0, 0, 0, 100000); + go->SummonGameObject(148838, -488.997, 96.61, -189.019, -1.52, 0, 0, 0, 0, 100000); } */ diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index b2dac036e39..0e90a641a2a 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -59,7 +59,7 @@ public: bool OnGossipHello(Player* pPlayer, GameObject* pGo) { if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) - pInstance->SetData(EVENT_STATE,pGo->GetEntry()); + pInstance->SetData(EVENT_STATE, pGo->GetEntry()); return false; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 1c10ea81f8a..f26c03bb142 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -129,7 +129,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(YELL_KILL1,YELL_KILL2,YELL_KILL3), me); + DoScriptText(RAND(YELL_KILL1, YELL_KILL2, YELL_KILL3), me); } void JustDied(Unit* /*Killer*/) @@ -139,9 +139,9 @@ public: if (pInstance) { pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE); - float x,y,z; - me->GetPosition(x,y,z); - me->SummonCreature(FELMYST, x,y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0); + float x, y, z; + me->GetPosition(x, y, z); + me->SummonCreature(FELMYST, x, y, z+30, me->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0); } } @@ -316,7 +316,7 @@ public: if (StompTimer <= diff) { - DoScriptText(RAND(YELL_LOVE1,YELL_LOVE2,YELL_LOVE3), me); + DoScriptText(RAND(YELL_LOVE1, YELL_LOVE2, YELL_LOVE3), me); DoCast(me->getVictim(), SPELL_STOMP); StompTimer = 30000; } else StompTimer -= diff; @@ -331,7 +331,7 @@ public: (*i)->CastSpell((*i), SPELL_BURN, true); break; } - BurnTimer = urand(60000,180000); + BurnTimer = urand(60000, 180000); } else BurnTimer -= diff; if (BerserkTimer < diff && !Enraged) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index dcfa7e461ce..5604f1d4a39 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -120,13 +120,13 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp) { if (Temp->isDead()) CAST_CRE(Temp)->Respawn(); else if (Temp->getVictim()) - me->getThreatManager().addThreat(Temp->getVictim(),0.0f); + me->getThreatManager().addThreat(Temp->getVictim(), 0.0f); } } @@ -152,7 +152,7 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } @@ -164,7 +164,7 @@ public: void KilledUnit(Unit * /*victim*/) { if (rand()%4 == 0) - DoScriptText(RAND(YELL_SAC_KILL_1,YELL_SAC_KILL_2), me); + DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -181,7 +181,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -231,7 +231,7 @@ public: if (pInstance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS)); + Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALYTHESS)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_ALYTHESS_DEAD, me); @@ -301,10 +301,10 @@ public: for (uint8 i = 0; i<3; ++i) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); - temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000); + temp = DoSpawnCreature(MOB_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); if (temp && pTarget) { - temp->AddThreat(pTarget,1000000);//don't change target(healers) + temp->AddThreat(pTarget, 1000000);//don't change target(healers) temp->AI()->AttackStart(pTarget); } } @@ -382,13 +382,13 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp) { if (Temp->isDead()) CAST_CRE(Temp)->Respawn(); else if (Temp->getVictim()) - me->getThreatManager().addThreat(Temp->getVictim(),0.0f); + me->getThreatManager().addThreat(Temp->getVictim(), 0.0f); } } @@ -415,7 +415,7 @@ public: if (pInstance) { - Unit* Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Unit* Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isAlive() && !(Temp->getVictim())) CAST_CRE(Temp)->AI()->AttackStart(who); } @@ -459,7 +459,7 @@ public: { if (rand()%4 == 0) { - DoScriptText(RAND(YELL_ALY_KILL_1,YELL_ALY_KILL_2), me); + DoScriptText(RAND(YELL_ALY_KILL_1, YELL_ALY_KILL_2), me); } } @@ -476,7 +476,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -568,7 +568,7 @@ public: if (pInstance) { Unit* Temp = NULL; - Temp = Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH)); + Temp = Unit::GetUnit((*me), pInstance->GetData64(DATA_SACROLASH)); if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_SACROLASH_DEAD, me); @@ -582,12 +582,12 @@ public: { if (pInstance) { - Creature* sisiter = Unit::GetCreature((*me),pInstance->GetData64(DATA_SACROLASH)); + Creature* sisiter = Unit::GetCreature((*me), pInstance->GetData64(DATA_SACROLASH)); if (sisiter && !sisiter->isDead() && sisiter->getVictim()) { - me->AddThreat(sisiter->getVictim(),0.0f); + me->AddThreat(sisiter->getVictim(), 0.0f); DoStartNoMovement(sisiter->getVictim()); - me->Attack(sisiter->getVictim(),false); + me->Attack(sisiter->getVictim(), false); } } } @@ -701,7 +701,7 @@ public: void EnterCombat(Unit * /*who*/){} - void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry* spell) { switch(spell->Id) { @@ -714,7 +714,7 @@ public: { pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); - } else pTarget->CastSpell(pTarget,SPELL_DARK_TOUCHED,true); + } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); } break; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 80a382d63f3..efcb1e1b29e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -187,7 +187,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(YELL_KILL1,YELL_KILL2), me); + DoScriptText(RAND(YELL_KILL1, YELL_KILL2), me); } void JustRespawned() @@ -436,20 +436,20 @@ public: break; case EVENT_CLEAVE: DoCast(me->getVictim(), SPELL_CLEAVE, false); - events.ScheduleEvent(EVENT_CLEAVE, urand(5000,10000)); + events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); break; case EVENT_CORROSION: DoCast(me->getVictim(), SPELL_CORROSION, false); - events.ScheduleEvent(EVENT_CORROSION, urand(20000,30000)); + events.ScheduleEvent(EVENT_CORROSION, urand(20000, 30000)); break; case EVENT_GAS_NOVA: DoCast(me, SPELL_GAS_NOVA, false); - events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000,25000)); + events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000)); break; case EVENT_ENCAPSULATE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); - events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000,30000)); + events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000)); break; case EVENT_FLIGHT: EnterPhase(PHASE_FLIGHT); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 17d7ba173b8..cc7ede77917 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -171,7 +171,7 @@ public: FrostBreathTimer = 15000; WildMagicTimer = 10000; TailLashTimer = 25000; - SpectralBlastTimer = urand(20000,25000); + SpectralBlastTimer = urand(20000, 25000); CheckTimer = 1000; ResetTimer = 30000; @@ -320,7 +320,7 @@ public: advance(i, rand()%targetList.size()); if ((*i)) { - (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST,true); + (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST, true); SpectralBlastTimer = 20000+rand()%5000; } else SpectralBlastTimer = 1000; } else SpectralBlastTimer -= diff; @@ -360,10 +360,10 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_EVIL_SLAY1,SAY_EVIL_SLAY2), me); + DoScriptText(RAND(SAY_EVIL_SLAY1, SAY_EVIL_SLAY2), me); } - void MovementInform(uint32 type,uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) { if (type != POINT_MOTION_TYPE) return; @@ -404,7 +404,7 @@ public: break; case 3: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->GetMotionMaster()->MovePoint(0,FLY_X,FLY_Y,FLY_Z); + me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 600000; break; default: @@ -422,7 +422,7 @@ public: break; case 2: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->GetMotionMaster()->MovePoint(0,FLY_X,FLY_Y,FLY_Z); + me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z); TalkTimer = 15000; break; case 3: @@ -658,7 +658,7 @@ public: EnterEvadeMode(); return; } - DoScriptText(RAND(SAY_SATH_SLAY1,SAY_SATH_SLAY2), me); + DoScriptText(RAND(SAY_SATH_SLAY1, SAY_SATH_SLAY2), me); } void JustDied(Unit * /*killer*/) @@ -686,7 +686,7 @@ public: if (i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5) { i->getSource()->RemoveAura(AURA_SPECTRAL_REALM); - i->getSource()->TeleportTo(me->GetMap()->GetId(),i->getSource()->GetPositionX(),i->getSource()->GetPositionY(),DRAGON_REALM_Z+5,i->getSource()->GetOrientation()); + i->getSource()->TeleportTo(me->GetMap()->GetId(), i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), DRAGON_REALM_Z+5, i->getSource()->GetOrientation()); } } } @@ -767,7 +767,7 @@ public: { if (pUnit->GetPositionZ() > me->GetPositionZ()+5) { - me->getThreatManager().modifyThreatPercent(pUnit,-100); + me->getThreatManager().modifyThreatPercent(pUnit, -100); } } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 86327f34c29..721659611de 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -324,7 +324,7 @@ public: } else { - if (GameObject* pOrb = GetOrb(urand(0,3))) + if (GameObject* pOrb = GetOrb(urand(0, 3))) { pOrb->CastSpell(me, SPELL_RING_OF_BLUE_FLAMES); pOrb->SetUInt32Value(GAMEOBJECT_FACTION, 35); @@ -468,7 +468,7 @@ public: if (uiRandomSayTimer < diff) { if (pInstance && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED) - DoScriptText(RAND(SAY_KJ_OFFCOMBAT1,SAY_KJ_OFFCOMBAT2,SAY_KJ_OFFCOMBAT3,SAY_KJ_OFFCOMBAT4,SAY_KJ_OFFCOMBAT5), me); + DoScriptText(RAND(SAY_KJ_OFFCOMBAT1, SAY_KJ_OFFCOMBAT2, SAY_KJ_OFFCOMBAT3, SAY_KJ_OFFCOMBAT4, SAY_KJ_OFFCOMBAT5), me); uiRandomSayTimer = 30000; } else uiRandomSayTimer -= diff; @@ -486,7 +486,7 @@ public: { me->RemoveAurasDueToSpell(SPELL_ANVEENA_ENERGY_DRAIN); phase = PHASE_NORMAL; - DoSpawnCreature(CREATURE_KILJAEDEN, 0, 0,0, 0, TEMPSUMMON_MANUAL_DESPAWN, 0); + DoSpawnCreature(CREATURE_KILJAEDEN, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN, 0); } } }; @@ -622,7 +622,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KJ_SLAY1,SAY_KJ_SLAY2), me); + DoScriptText(RAND(SAY_KJ_SLAY1, SAY_KJ_SLAY2), me); } void EnterEvadeMode() @@ -651,26 +651,26 @@ public: TimerIsDeactivated[TIMER_SHADOW_SPIKE] = false; Timer[TIMER_SHADOW_SPIKE] = 100; // empowered orbs before darkness - Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(10000,40000); + Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(10000, 40000); Timer[TIMER_ORBS_EMPOWER] = (Phase == PHASE_SACRIFICE) ? 10000 : 5000; } void CastSinisterReflection() { - DoScriptText(RAND(SAY_KJ_REFLECTION1,SAY_KJ_REFLECTION2), me); + DoScriptText(RAND(SAY_KJ_REFLECTION1, SAY_KJ_REFLECTION2), me); for (uint8 i = 0; i < 4; ++i) { - float x,y,z; + float x, y, z; Unit *pTarget = NULL; for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break; + if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0))break; } if (pTarget) { - pTarget->GetPosition(x,y,z); - if (Creature* pSinisterReflection = me->SummonCreature(CREATURE_SINISTER_REFLECTION, x,y,z,0, TEMPSUMMON_CORPSE_DESPAWN, 0)) + pTarget->GetPosition(x, y, z); + if (Creature* pSinisterReflection = me->SummonCreature(CREATURE_SINISTER_REFLECTION, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0)) { pSinisterReflection->SetDisplayId(pTarget->GetDisplayId()); pSinisterReflection->AI()->AttackStart(pTarget); @@ -752,7 +752,7 @@ public: for (uint8 z = 0; z < 6; ++z) { pRandomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) + if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; } @@ -782,7 +782,7 @@ public: sy = ShieldOrbLocations[0][1] + sin(ShieldOrbLocations[i][1]); me->SummonCreature(CREATURE_SHIELD_ORB, sx, sy, SHIELD_ORB_Z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); } - Timer[TIMER_SUMMON_SHILEDORB] = urand(30000,60000); // 30-60seconds cooldown + Timer[TIMER_SUMMON_SHILEDORB] = urand(30000, 60000); // 30-60seconds cooldown Timer[TIMER_SOUL_FLAY] = 2000; break; case TIMER_SHADOW_SPIKE: //Phase 3 @@ -816,10 +816,10 @@ public: } else { - Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(40000,70000); + Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(40000, 70000); IsInDarkness = false; DoCastAOE(SPELL_DARKNESS_OF_A_THOUSAND_SOULS_DAMAGE); - DoScriptText(RAND(SAY_KJ_DARKNESS1,SAY_KJ_DARKNESS2,SAY_KJ_DARKNESS3), me); + DoScriptText(RAND(SAY_KJ_DARKNESS1, SAY_KJ_DARKNESS2, SAY_KJ_DARKNESS3), me); } Timer[TIMER_SOUL_FLAY] = 9000; } @@ -846,13 +846,13 @@ public: for (uint8 z = 0; z < 6; ++z) { pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break; + if (!pTarget || !pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, 0)) break; } if (pTarget) { float x, y, z; pTarget->GetPosition(x, y, z); - me->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x,y,z,0, TEMPSUMMON_TIMED_DESPAWN,15000); + me->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 15000); } Timer[TIMER_ARMAGEDDON] = 2000; // No, I'm not kidding break; @@ -933,7 +933,7 @@ public: void Reset() { // TODO: Timers! - ShadowBoltVolleyTimer = urand(8000,14000); // So they don't all cast it in the same moment. + ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment. FelfirePortalTimer = 20000; if (pInstance) pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); @@ -989,7 +989,7 @@ public: // Felfire Portal - Creatres a portal, that spawns Volatile Felfire Fiends, which do suicide bombing. if (FelfirePortalTimer <= diff) { - if (Creature* pPortal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) + if (Creature* pPortal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000)) { std::list<HostileReference*>::iterator itr; for (itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) @@ -1045,8 +1045,8 @@ public: if (uiSpawnFiendTimer <= diff) { if (Creature* pFiend = DoSpawnCreature(CREATURE_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) - pFiend->AddThreat(SelectTarget(SELECT_TARGET_RANDOM,0), 100000.0f); - uiSpawnFiendTimer = urand(4000,8000); + pFiend->AddThreat(SelectTarget(SELECT_TARGET_RANDOM, 0), 100000.0f); + uiSpawnFiendTimer = urand(4000, 8000); } else uiSpawnFiendTimer -= diff; } }; @@ -1196,13 +1196,13 @@ public: { me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); bPointReached = true; - uiTimer = urand(500,1000); + uiTimer = urand(500, 1000); uiCheckTimer = 1000; r = 17; c = 0; mx = ShieldOrbLocations[0][0]; my = ShieldOrbLocations[0][1]; - bClockwise = urand(0,1); + bClockwise = urand(0, 1); } void UpdateAI(const uint32 diff) @@ -1221,7 +1221,7 @@ public: } bPointReached = false; uiCheckTimer = 1000; - me->GetMotionMaster()->MovePoint(1,x, y, SHIELD_ORB_Z); + me->GetMotionMaster()->MovePoint(1, x, y, SHIELD_ORB_Z); c += M_PI/32; if (c >= 2*M_PI) c = 0; } @@ -1229,7 +1229,7 @@ public: { if (uiCheckTimer <= diff) { - DoTeleportTo(x,y,SHIELD_ORB_Z); + DoTeleportTo(x, y, SHIELD_ORB_Z); bPointReached = true; } else uiCheckTimer -= diff; @@ -1239,7 +1239,7 @@ public: { if (Unit* random = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0)) DoCast(random, SPELL_SHADOW_BOLT, false); - uiTimer = urand(500,1000); + uiTimer = urand(500, 1000); } else uiTimer -= diff; } @@ -1319,7 +1319,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_MOONFIRE, false); - uiTimer[1] = urand(2000,4000); + uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1327,19 +1327,19 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); - uiTimer[1] = urand(8000,10000); + uiTimer[1] = urand(8000, 10000); } if (uiTimer[2] <= diff) { DoCast(me->getVictim(), SPELL_SR_SHOOT, false); - uiTimer[2] = urand(4000,6000); + uiTimer[2] = urand(4000, 6000); } if (me->IsWithinMeleeRange(me->getVictim(), 6)) { if (uiTimer[0] <= diff) { DoCast(me->getVictim(), SPELL_SR_MULTI_SHOT, false); - uiTimer[0] = urand(6000,8000); + uiTimer[0] = urand(6000, 8000); } DoMeleeAttackIfReady(); } @@ -1348,7 +1348,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_FIREBALL, false); - uiTimer[1] = urand(2000,4000); + uiTimer[1] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1356,12 +1356,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_SHADOW_BOLT, false); - uiTimer[1] = urand(3000,5000); + uiTimer[1] = urand(3000, 5000); } if (uiTimer[2] <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true); - uiTimer[2] = urand(2000,4000); + uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1369,7 +1369,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_WHIRLWIND, false); - uiTimer[1] = urand(9000,11000); + uiTimer[1] = urand(9000, 11000); } DoMeleeAttackIfReady(); break; @@ -1377,12 +1377,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false); - uiTimer[1] = urand(6000,8000); + uiTimer[1] = urand(6000, 8000); } if (uiTimer[2] <= diff) { DoCast(me->getVictim(), SPELL_SR_HOLY_SHOCK, false); - uiTimer[2] = urand(2000,4000); + uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); break; @@ -1390,12 +1390,12 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HOLY_SMITE, false); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } if (uiTimer[2] <= diff) { DoCast(me, SPELL_SR_RENEW, false); - uiTimer[2] = urand(6000,8000); + uiTimer[2] = urand(6000, 8000); } DoMeleeAttackIfReady(); break; @@ -1403,7 +1403,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_EARTH_SHOCK, false); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); break; @@ -1411,7 +1411,7 @@ public: if (uiTimer[1] <= diff) { DoCast(me->getVictim(), SPELL_SR_HEMORRHAGE, true); - uiTimer[1] = urand(4000,6000); + uiTimer[1] = urand(4000, 6000); } DoMeleeAttackIfReady(); break; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 6509a0317a6..015f7b9e40c 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -148,16 +148,16 @@ public: switch(summoned->GetEntry()) { case CREATURE_DARK_FIENDS: - summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); + summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); break; case CREATURE_DARKNESS: summoned->AddUnitState(UNIT_STAT_STUNNED); - float x,y,z,o; - summoned->GetHomePosition(x,y,z,o); - me->SummonCreature(CREATURE_DARK_FIENDS, x,y,z,o, TEMPSUMMON_CORPSE_DESPAWN, 0); + float x, y, z, o; + summoned->GetHomePosition(x, y, z, o); + me->SummonCreature(CREATURE_DARK_FIENDS, x, y, z, o, TEMPSUMMON_CORPSE_DESPAWN, 0); break; } - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); Summons.Summon(summoned); } @@ -248,7 +248,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoCastAOE(SPELL_NEGATIVE_ENERGY,false); + DoCastAOE(SPELL_NEGATIVE_ENERGY, false); if (pInstance) pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS); @@ -276,10 +276,10 @@ public: me->SetVisible(false); break; case CREATURE_DARK_FIENDS: - summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); + summoned->CastSpell(summoned, SPELL_DARKFIEND_VISUAL, false); break; } - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); Summons.Summon(summoned); } @@ -331,13 +331,13 @@ public: { DarkFiend = false; for (uint8 i = 0; i < 8; ++i) - me->SummonCreature(CREATURE_DARK_FIENDS,DarkFiends[i][0],DarkFiends[i][1],DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(CREATURE_DARK_FIENDS, DarkFiends[i][0], DarkFiends[i][1], DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); Timer[TIMER_DARKNESS] = 42000; } break; case TIMER_HUMANOIDES: for (uint8 i = 0; i < 6; ++i) - me->SummonCreature(uint32(Humanoides[i][0]),Humanoides[i][1],Humanoides[i][2],Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(uint32(Humanoides[i][0]), Humanoides[i][1], Humanoides[i][2], Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0); Timer[TIMER_HUMANOIDES] = 60000; break; case TIMER_PHASE: @@ -415,9 +415,9 @@ public: void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) { - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - DoTeleportTo(x,y,z); + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + DoTeleportTo(x, y, z); InAction = true; switch(Spell->Id) { @@ -535,15 +535,15 @@ public: PulseTimer = 3000; VoidBlastTimer = 45000; //is this a correct timer? - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - DoTeleportTo(x,y,71); + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + DoTeleportTo(x, y, 71); } void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 8; ++i) - me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), float(rand()%6), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); + me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%6), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); } void UpdateAI(const uint32 diff) @@ -629,7 +629,7 @@ public: me->RemoveAura(SPELL_BLACKHOLE_GROW, 1); break; case 3: - SpellTimer = urand(400,900); + SpellTimer = urand(400, 900); NeedForAHack = 1; if (Unit* Temp = me->getVictim()) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index f127bc761fb..9cf1344beba 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -129,7 +129,7 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* plr = itr->getSource(); - if (plr && !plr->HasAura(45839,0)) + if (plr && !plr->HasAura(45839, 0)) return plr; } } @@ -226,15 +226,15 @@ public: { if (data == NOT_STARTED || data == DONE) { - HandleGameObject(ForceField,true); - HandleGameObject(KalecgosWall[0],true); - HandleGameObject(KalecgosWall[1],true); + HandleGameObject(ForceField, true); + HandleGameObject(KalecgosWall[0], true); + HandleGameObject(KalecgosWall[1], true); } else if (data == IN_PROGRESS) { - HandleGameObject(ForceField,false); - HandleGameObject(KalecgosWall[0],false); - HandleGameObject(KalecgosWall[1],false); + HandleGameObject(ForceField, false); + HandleGameObject(KalecgosWall[0], false); + HandleGameObject(KalecgosWall[1], false); } m_auiEncounter[0] = data; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 66d3ac557fb..01730f8142a 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -101,7 +101,7 @@ class boss_archaedas : public CreatureScript if (pMinion && pMinion->isAlive()) { DoCast(pMinion, SPELL_AWAKEN_VAULT_WALKER, bFlag); - pMinion->CastSpell(pMinion, SPELL_ARCHAEDAS_AWAKEN,true); + pMinion->CastSpell(pMinion, SPELL_ARCHAEDAS_AWAKEN, true); } } @@ -109,7 +109,7 @@ class boss_archaedas : public CreatureScript { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } void SpellHit(Unit* /*caster*/, const SpellEntry *spell) @@ -118,7 +118,7 @@ class boss_archaedas : public CreatureScript if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN)) { me->MonsterYell(SAY_AGGRO, LANG_UNIVERSAL, 0); - DoPlaySoundToSet(me,SOUND_AGGRO); + DoPlaySoundToSet(me, SOUND_AGGRO); iAwakenTimer = 4000; bWakingUp = true; } @@ -161,12 +161,12 @@ class boss_archaedas : public CreatureScript //If we are <66 summon the guardians if (!bGuardiansAwake && !HealthAbovePct(66)) { - ActivateMinion(pInstance->GetData64(5),true); // EarthenGuardian1 - ActivateMinion(pInstance->GetData64(6),true); // EarthenGuardian2 - ActivateMinion(pInstance->GetData64(7),true); // EarthenGuardian3 - ActivateMinion(pInstance->GetData64(8),true); // EarthenGuardian4 - ActivateMinion(pInstance->GetData64(9),true); // EarthenGuardian5 - ActivateMinion(pInstance->GetData64(10),false); // EarthenGuardian6 + ActivateMinion(pInstance->GetData64(5), true); // EarthenGuardian1 + ActivateMinion(pInstance->GetData64(6), true); // EarthenGuardian2 + ActivateMinion(pInstance->GetData64(7), true); // EarthenGuardian3 + ActivateMinion(pInstance->GetData64(8), true); // EarthenGuardian4 + ActivateMinion(pInstance->GetData64(9), true); // EarthenGuardian5 + ActivateMinion(pInstance->GetData64(10), false); // EarthenGuardian6 me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON); bGuardiansAwake = true; @@ -175,10 +175,10 @@ class boss_archaedas : public CreatureScript //If we are <33 summon the vault walkers if (!bVaultWalkersAwake && !HealthAbovePct(33)) { - ActivateMinion(pInstance->GetData64(1),true); // VaultWalker1 - ActivateMinion(pInstance->GetData64(2),true); // VaultWalker2 - ActivateMinion(pInstance->GetData64(3),true); // VaultWalker3 - ActivateMinion(pInstance->GetData64(4),false); // VaultWalker4 + ActivateMinion(pInstance->GetData64(1), true); // VaultWalker1 + ActivateMinion(pInstance->GetData64(2), true); // VaultWalker2 + ActivateMinion(pInstance->GetData64(3), true); // VaultWalker3 + ActivateMinion(pInstance->GetData64(4), false); // VaultWalker4 me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMON2); bVaultWalkersAwake = true; @@ -364,7 +364,7 @@ class mob_stonekeepers : public CreatureScript void JustDied(Unit * /*attacker*/) { - DoCast (me, SPELL_SELF_DESTRUCT,true); + DoCast (me, SPELL_SELF_DESTRUCT, true); if (pInstance) pInstance->SetData(DATA_STONE_KEEPERS, IN_PROGRESS); // activate next stonekeeper } @@ -402,7 +402,7 @@ class go_altar_of_archaedas : public GameObjectScript pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false); - pInstance->SetData64(0,pPlayer->GetGUID()); // activate archaedas + pInstance->SetData64(0, pPlayer->GetGUID()); // activate archaedas return false; } }; diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 0add39a3f6e..3179ccc9949 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -148,7 +148,7 @@ class instance_uldaman : public InstanceMapScript { creature->setFaction(35); creature->RemoveAllAuras(); - //creature->RemoveFlag (UNIT_FIELD_FLAGS,UNIT_FLAG_ANIMATION_FROZEN); + //creature->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_ANIMATION_FROZEN); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } @@ -178,7 +178,7 @@ class instance_uldaman : public InstanceMapScript Creature* pTarget = instance->GetCreature(*i); if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; - pTarget->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); pTarget->setFaction(14); pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return; // only want the first one we find @@ -200,7 +200,7 @@ class instance_uldaman : public InstanceMapScript if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; archaedas->CastSpell(pTarget, SPELL_AWAKEN_VAULT_WALKER, true); - pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN,true); + pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN, true); return; // only want the first one we find } } @@ -247,7 +247,7 @@ class instance_uldaman : public InstanceMapScript if (Unit::GetUnit(*archaedas, target)) { - archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN,false); + archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN, false); uiWhoWokeuiArchaedasGUID = target; } } @@ -259,7 +259,7 @@ class instance_uldaman : public InstanceMapScript return; ironaya->setFaction(415); - ironaya->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); ironaya->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 56acd4abd7d..043243a7d8f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -104,9 +104,9 @@ class boss_akilzon : public CreatureScript if (pInstance) pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED); - StaticDisruption_Timer = urand(10000,20000); //10 to 20 seconds (bosskillers) - GustOfWind_Timer = urand(20000,30000); //20 to 30 seconds(bosskillers) - CallLighting_Timer = urand(10000,20000); //totaly random timer. can't find any info on this + StaticDisruption_Timer = urand(10000, 20000); //10 to 20 seconds (bosskillers) + GustOfWind_Timer = urand(20000, 30000); //20 to 30 seconds(bosskillers) + CallLighting_Timer = urand(10000, 20000); //totaly random timer. can't find any info on this ElectricalStorm_Timer = 60000; //60 seconds(bosskillers) Enrage_Timer = 10*MINUTE*IN_MILLISECONDS; //10 minutes till enrage(bosskillers) SummonEagles_Timer = 99999; @@ -146,7 +146,7 @@ class boss_akilzon : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); @@ -163,7 +163,7 @@ class boss_akilzon : public CreatureScript { for (uint8 i = 0; i < 8; ++i) { - Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]); + Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (bird && bird->isAlive()) { bird->SetVisible(false); @@ -219,7 +219,7 @@ class boss_akilzon : public CreatureScript } } // visual - float x,y,z; + float x, y, z; z = me->GetPositionZ(); for (uint8 i = 0; i < 5+rand()%5; ++i) { @@ -232,7 +232,7 @@ class boss_akilzon : public CreatureScript trigger->SetHealth(100000); trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); if (Cloud) - Cloud->CastCustomSpell(trigger, /*43661*/43137, &bp0, NULL, NULL,true, 0, 0, Cloud->GetGUID()); + Cloud->CastCustomSpell(trigger, /*43661*/43137, &bp0, NULL, NULL, true, 0, 0, Cloud->GetGUID()); } } } @@ -244,7 +244,7 @@ class boss_akilzon : public CreatureScript me->InterruptNonMeleeSpells(false); CloudGUID = 0; if (Cloud) - Cloud->DealDamage(Cloud, Cloud->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + Cloud->DealDamage(Cloud, Cloud->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); SetWeather(WEATHER_STATE_FINE, 0.0f); isRaining = false; } @@ -325,12 +325,12 @@ class boss_akilzon : public CreatureScript } pTarget->CastSpell(pTarget, 44007, true);//cloud visual DoCast(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual - float x,y,z; - pTarget->GetPosition(x,y,z); + float x, y, z; + pTarget->GetPosition(x, y, z); if (pTarget) { pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - pTarget->SendMonsterMove(x,y,me->GetPositionZ()+15,0); + pTarget->SendMonsterMove(x, y, me->GetPositionZ()+15, 0); } Unit *Cloud = me->SummonTrigger(x, y, me->GetPositionZ()+16, 0, 15000); if (Cloud) @@ -359,16 +359,16 @@ class boss_akilzon : public CreatureScript for (uint8 i = 0; i < 8; ++i) { - Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]); + Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - x = pTarget->GetPositionX() + irand(-10,10); - y = pTarget->GetPositionY() + irand(-10,10); - z = pTarget->GetPositionZ() + urand(16,20); + x = pTarget->GetPositionX() + irand(-10, 10); + y = pTarget->GetPositionY() + irand(-10, 10); + z = pTarget->GetPositionZ() + urand(16, 20); if (z > 95) - z = 95.0f - urand(0,5); + z = 95.0f - urand(0, 5); } Creature *pCreature = me->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (pCreature) @@ -448,11 +448,11 @@ class mob_akilzon_eagle : public CreatureScript float x, y, z; if (EagleSwoop_Timer) { - x = pTarget->GetPositionX() + irand(-10,10); - y = pTarget->GetPositionY() + irand(-10,10); - z = pTarget->GetPositionZ() + urand(10,15); + x = pTarget->GetPositionX() + irand(-10, 10); + y = pTarget->GetPositionY() + irand(-10, 10); + z = pTarget->GetPositionZ() + urand(10, 15); if (z > 95) - z = 95.0f - urand(0,5); + z = 95.0f - urand(0, 5); } else { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f7d1b3f5ead..109a3f14760 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -186,7 +186,7 @@ class boss_halazzi : public CreatureScript break; case PHASE_HUMAN: //DoCast(me, SPELL_SUMMON_LYNX, true); - DoSpawnCreature(MOB_SPIRIT_LYNX, 5,5,0,0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(MOB_SPIRIT_LYNX, 5, 5, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); me->SetMaxHealth(400000); me->SetHealth(400000); ShockTimer = 10000; @@ -238,7 +238,7 @@ class boss_halazzi : public CreatureScript if (FrenzyTimer <= diff) { DoCast(me, SPELL_FRENZY); - FrenzyTimer = urand(10000,15000); + FrenzyTimer = urand(10000, 15000); } else FrenzyTimer -= diff; if (Phase == PHASE_LYNX) @@ -262,7 +262,7 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->IsNonMeleeSpellCasted(false)) DoCast(pTarget, SPELL_EARTHSHOCK); @@ -315,7 +315,7 @@ class boss_halazzi : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -364,7 +364,7 @@ class mob_halazzi_lynx : public CreatureScript void Reset() { - FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds + FrenzyTimer = urand(30000, 50000); //frenzy every 30-50 seconds shredder_timer = 4000; } @@ -390,7 +390,7 @@ class mob_halazzi_lynx : public CreatureScript if (FrenzyTimer <= diff) { DoCast(me, SPELL_LYNX_FRENZY); - FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds + FrenzyTimer = urand(30000, 50000); //frenzy every 30-50 seconds } else FrenzyTimer -= diff; if (shredder_timer <= diff) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index b9b5253c511..4a7f4eaa9c8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -264,7 +264,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4; ++i) { - Unit* Temp = Unit::GetUnit((*me),AddGUID[i]); + Unit* Temp = Unit::GetUnit((*me), AddGUID[i]); if (Temp && Temp->isAlive()) CAST_CRE(Temp)->AI()->AttackStart(me->getVictim()); else @@ -277,7 +277,7 @@ class boss_hexlord_malacrass : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -300,7 +300,7 @@ class boss_hexlord_malacrass : public CreatureScript for (uint8 i = 0; i < 4 ; ++i) { - Unit* Temp = Unit::GetUnit((*me),AddGUID[i]); + Unit* Temp = Unit::GetUnit((*me), AddGUID[i]); if (Temp && Temp->isAlive()) Temp->DealDamage(Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -371,7 +371,7 @@ class boss_hexlord_malacrass : public CreatureScript DoCast(me, SPELL_DRAIN_POWER, true); me->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_YELL_DRAIN_POWER); - DrainPower_Timer = urand(40000,55000); // must cast in 60 sec, or buff/debuff will disappear + DrainPower_Timer = urand(40000, 55000); // must cast in 60 sec, or buff/debuff will disappear } else DrainPower_Timer -= diff; if (SpiritBolts_Timer <= diff) @@ -410,7 +410,7 @@ class boss_hexlord_malacrass : public CreatureScript //me->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SIPHON_SOUL); PlayerGUID = pTarget->GetGUID(); - PlayerAbility_Timer = urand(8000,10000); + PlayerAbility_Timer = urand(8000, 10000); PlayerClass = pTarget->getClass() - 1; if (PlayerClass == CLASS_DRUID-1) @@ -428,7 +428,7 @@ class boss_hexlord_malacrass : public CreatureScript //if (pTarget && pTarget->isAlive()) //{ UseAbility(); - PlayerAbility_Timer = urand(8000,10000); + PlayerAbility_Timer = urand(8000, 10000); //} } else PlayerAbility_Timer -= diff; @@ -437,7 +437,7 @@ class boss_hexlord_malacrass : public CreatureScript void UseAbility() { - uint8 random = urand(0,2); + uint8 random = urand(0, 2); Unit *pTarget = NULL; switch(PlayerAbility[PlayerClass][random].target) { @@ -599,7 +599,7 @@ class boss_alyson_antille : public CreatureScript } else { - if (urand(0,1)) + if (urand(0, 1)) pTarget = DoSelectLowestHpFriendly(50, 0); else pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); @@ -611,7 +611,7 @@ class boss_alyson_antille : public CreatureScript /*if (dispelmagic_timer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) { Unit *pTarget = SelectTarget(); @@ -865,7 +865,7 @@ class boss_fenstalker : public CreatureScript if (volatileinf_timer <= diff) { // core bug - me->getVictim()->CastSpell(me->getVictim(),SPELL_VOLATILE_INFECTION, false); + me->getVictim()->CastSpell(me->getVictim(), SPELL_VOLATILE_INFECTION, false); volatileinf_timer = 12000; } else volatileinf_timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 251ae131d01..cd733460d06 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -87,18 +87,18 @@ float FireWallCoords[4][4] = float hatcherway[2][5][3] = { { - {-87.46f,1170.09f,6}, - {-74.41f,1154.75f,6}, - {-52.74f,1153.32f,19}, - {-33.37f,1172.46f,19}, - {-33.09f,1203.87f,19} + {-87.46f, 1170.09f, 6}, + {-74.41f, 1154.75f, 6}, + {-52.74f, 1153.32f, 19}, + {-33.37f, 1172.46f, 19}, + {-33.09f, 1203.87f, 19} }, { - {-86.57f,1132.85f,6}, - {-73.94f,1146.00f,6}, - {-52.29f,1146.51f,19}, - {-33.57f,1125.72f,19}, - {-34.29f,1095.22f,19} + {-86.57f, 1132.85f, 6}, + {-73.94f, 1146.00f, 6}, + {-52.29f, 1146.51f, 19}, + {-33.57f, 1125.72f, 19}, + {-34.29f, 1095.22f, 19} } }; class boss_janalai : public CreatureScript @@ -175,7 +175,7 @@ class boss_janalai : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void EnterCombat(Unit * /*who*/) @@ -210,9 +210,9 @@ class boss_janalai : public CreatureScript for (uint8 j = 0; j < WallNum; j++) { if (WallNum == 3) - wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0],FireWallCoords[i][1]+5*(j-1),FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000); + wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0], FireWallCoords[i][1]+5*(j-1), FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000); else - wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j,FireWallCoords[i][1],FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000); + wall = me->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j, FireWallCoords[i][1], FireWallCoords[i][2], FireWallCoords[i][3], TEMPSUMMON_TIMED_DESPAWN, 15000); if (wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true); } } @@ -312,7 +312,7 @@ class boss_janalai : public CreatureScript { Boom(); isBombing = false; - BombTimer = urand(20000,40000); + BombTimer = urand(20000, 40000); me->RemoveAurasDueToSpell(SPELL_FIRE_BOMB_CHANNEL); if (EnrageTimer <= 10000) EnrageTimer = 0; @@ -369,10 +369,10 @@ class boss_janalai : public CreatureScript me->AttackStop(); me->GetMotionMaster()->Clear(); - DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); + DoTeleportTo(JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2]); me->StopMoving(); DoCast(me, SPELL_FIRE_BOMB_CHANNEL, false); - //DoTeleportPlayer(me, JanalainPos[0][0], JanalainPos[0][1],JanalainPos[0][2], 0); + //DoTeleportPlayer(me, JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2], 0); //DoCast(me, SPELL_TELE_TO_CENTER, true); FireWall(); @@ -400,7 +400,7 @@ class boss_janalai : public CreatureScript me->AttackStop(); me->GetMotionMaster()->Clear(); - DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); + DoTeleportTo(JanalainPos[0][0], JanalainPos[0][1], JanalainPos[0][2]); me->StopMoving(); DoCast(me, SPELL_HATCH_ALL, false); HatchAllEggs(2); @@ -411,8 +411,8 @@ class boss_janalai : public CreatureScript if (HatchAllEggs(0)) { DoScriptText(SAY_SUMMON_HATCHER, me); - me->SummonCreature(MOB_AMANI_HATCHER,hatcherway[0][0][0],hatcherway[0][0][1],hatcherway[0][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); - me->SummonCreature(MOB_AMANI_HATCHER,hatcherway[1][0][0],hatcherway[1][0][1],hatcherway[1][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); + me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); HatcherTimer = 90000; } else @@ -426,7 +426,7 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); @@ -578,7 +578,7 @@ class mob_janalai_hatcher : public CreatureScript if (WaitTimer) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,hatcherway[side][waypoint][0],hatcherway[side][waypoint][1],hatcherway[side][waypoint][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[side][waypoint][0], hatcherway[side][waypoint][1], hatcherway[side][waypoint][2]); ++waypoint; WaitTimer = 0; } @@ -637,9 +637,9 @@ class mob_janalai_hatchling : public CreatureScript { BuffetTimer = 7000; if (me->GetPositionY() > 1150) - me->GetMotionMaster()->MovePoint(0, hatcherway[0][3][0]+rand()%4-2,1150.0f+rand()%4-2,hatcherway[0][3][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[0][3][0]+rand()%4-2, 1150.0f+rand()%4-2, hatcherway[0][3][2]); else - me->GetMotionMaster()->MovePoint(0, hatcherway[1][3][0]+rand()%4-2,1150.0f+rand()%4-2,hatcherway[1][3][2]); + me->GetMotionMaster()->MovePoint(0, hatcherway[1][3][0]+rand()%4-2, 1150.0f+rand()%4-2, hatcherway[1][3][2]); me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 846e2179822..76a2d09df75 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,12 +30,12 @@ EndScriptData */ //Trash Waves float NalorakkWay[8][3] = { - { 18.569f, 1414.512f, 11.42f},// waypoint 1 + { 18.569f, 1414.512f, 11.42f}, // waypoint 1 {-17.264f, 1419.551f, 12.62f}, - {-52.642f, 1419.357f, 27.31f},// waypoint 2 + {-52.642f, 1419.357f, 27.31f}, // waypoint 2 {-69.908f, 1419.721f, 27.31f}, {-79.929f, 1395.958f, 27.31f}, - {-80.072f, 1374.555f, 40.87f},// waypoint 3 + {-80.072f, 1374.555f, 40.87f}, // waypoint 3 {-80.072f, 1314.398f, 40.87f}, {-80.072f, 1295.775f, 48.60f} // waypoint 4 }; @@ -135,11 +135,11 @@ class boss_nalorakk : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); inMove = false; waitTimer = 0; - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); }else { - (*me).GetMotionMaster()->MovePoint(0,NalorakkWay[7][0],NalorakkWay[7][1],NalorakkWay[7][2]); + (*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]); } if (pInstance) @@ -180,7 +180,7 @@ class boss_nalorakk : public CreatureScript for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { - if ((*i) && me->IsWithinDistInMap((*i),25)) + if ((*i) && me->IsWithinDistInMap((*i), 25)) { (*i)->SetNoCallAssistance(true); (*i)->AI()->AttackStart(pTarget); @@ -214,7 +214,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE1); - (*me).GetMotionMaster()->MovePoint(1,NalorakkWay[1][0],NalorakkWay[1][1],NalorakkWay[1][2]); + (*me).GetMotionMaster()->MovePoint(1, NalorakkWay[1][0], NalorakkWay[1][1], NalorakkWay[1][2]); MovePhase ++; inMove = true; @@ -227,7 +227,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE2); - (*me).GetMotionMaster()->MovePoint(3,NalorakkWay[3][0],NalorakkWay[3][1],NalorakkWay[3][2]); + (*me).GetMotionMaster()->MovePoint(3, NalorakkWay[3][0], NalorakkWay[3][1], NalorakkWay[3][2]); MovePhase ++; inMove = true; @@ -240,7 +240,7 @@ class boss_nalorakk : public CreatureScript me->MonsterYell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE3); - (*me).GetMotionMaster()->MovePoint(6,NalorakkWay[6][0],NalorakkWay[6][1],NalorakkWay[6][2]); + (*me).GetMotionMaster()->MovePoint(6, NalorakkWay[6][0], NalorakkWay[6][1], NalorakkWay[6][2]); MovePhase ++; inMove = true; @@ -288,7 +288,7 @@ class boss_nalorakk : public CreatureScript void KilledUnit(Unit* /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -348,7 +348,7 @@ class boss_nalorakk : public CreatureScript if (waitTimer <= diff) { (*me).GetMotionMaster()->MovementExpired(); - (*me).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]); + (*me).GetMotionMaster()->MovePoint(MovePhase, NalorakkWay[MovePhase][0], NalorakkWay[MovePhase][1], NalorakkWay[MovePhase][2]); waitTimer = 0; } else waitTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 87d79ba7121..dae48291e6d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -239,7 +239,7 @@ class boss_zuljin : public CreatureScript if (Intro_Timer) return; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0); @@ -262,7 +262,7 @@ class boss_zuljin : public CreatureScript Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE); if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[3])) - Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } void AttackStart(Unit *who) @@ -358,7 +358,7 @@ class boss_zuljin : public CreatureScript if (Phase > 0) { if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[Phase - 1])) - Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } if (Unit *Temp = Unit::GetUnit(*me, SpiritGUID[NextPhase - 1])) Temp->CastSpell(me, SPELL_SIPHON_SOUL, false); // should m cast on temp diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 9496d22200b..26bb7bb631c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -86,8 +86,8 @@ class npc_forest_frog : public CreatureScript if (cEntry) me->UpdateEntry(cEntry); - if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1,DONE); - if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2,DONE); + if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1, DONE); + if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2, DONE); } } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 9f787589b8e..dbbe60d7cef 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript if (m_uiMark_Timer <= uiDiff) { - Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pMarkedTarget) { @@ -193,7 +193,7 @@ class boss_arlokk : public CreatureScript { DoCast(me->getVictim(), SPELL_GOUGE); - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); m_uiGouge_Timer = 17000+rand()%10000; } @@ -242,7 +242,7 @@ class boss_arlokk : public CreatureScript me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35))); me->UpdateDamagePhysical(BASE_ATTACK); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) AttackStart(pTarget); m_bIsPhaseTwo = true; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index c8ea4f89585..06ea67db8c1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -68,10 +68,10 @@ class boss_grilek : public CreatureScript DoCast(me, SPELL_AVARTAR); Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); if (pTarget) AttackStart(pTarget); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index e53c66082dd..70d4d160ca0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -132,7 +132,7 @@ class boss_hakkar : public CreatureScript //CauseInsanity_Timer /*if (CauseInsanity_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; @@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript //WillOfHakkar_Timer if (WillOfHakkar_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 04474c9383c..eef2c3cce01 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -84,11 +84,11 @@ class boss_hazzarah : public CreatureScript Unit *pTarget = NULL; for (uint8 i = 0; i < 3; ++i) { - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Illusion = me->SummonCreature(15163,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000); + Creature *Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) Illusion->AI()->AttackStart(pTarget); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index a80dd889d7e..c9cfffd690d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); AttackStart(pTarget); @@ -136,24 +136,24 @@ class boss_jeklik : public CreatureScript if (SpawnBats_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature* Bat = NULL; - Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12291.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12289.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368, -12293.6220f, -1380.2640f, 144.8304f, 5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); SpawnBats_Timer = 60000; @@ -165,7 +165,7 @@ class boss_jeklik : public CreatureScript { if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index f78a47c6585..4096f982095 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -90,7 +90,7 @@ class boss_jindo : public CreatureScript if (HealingWard_Timer <= diff) { //DoCast(me, SPELL_POWERFULLHEALINGWARD); - me->SummonCreature(14987, me->GetPositionX()+3, me->GetPositionY()-2, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,30000); + me->SummonCreature(14987, me->GetPositionX()+3, me->GetPositionY()-2, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000); HealingWard_Timer = 14000 + rand()%6000; } else HealingWard_Timer -= diff; @@ -100,7 +100,7 @@ class boss_jindo : public CreatureScript DoCast(me->getVictim(), SPELL_HEX); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); Hex_Timer = 12000 + rand()%8000; } else Hex_Timer -= diff; @@ -108,7 +108,7 @@ class boss_jindo : public CreatureScript //Casting the delusion curse with a shade. So shade will attack the same target with the curse. if (Delusions_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_DELUSIONSOFJINDO); @@ -124,13 +124,13 @@ class boss_jindo : public CreatureScript if (Teleport_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(pTarget, -11583.7783f,-1249.4278f,77.5471f,4.745f); + DoTeleportPlayer(pTarget, -11583.7783f, -1249.4278f, 77.5471f, 4.745f); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(pTarget,-100); + DoModifyThreatPercent(pTarget, -100); Creature *Skeletons; Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index e4054c9032b..5c8ba750bda 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -121,7 +121,7 @@ class boss_mandokir : public CreatureScript uint64 JindoGUID = m_pInstance->GetData64(DATA_JINDO); if (JindoGUID) { - if (Unit* jTemp = Unit::GetUnit(*me,JindoGUID)) + if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID)) { if (jTemp->isAlive()) DoScriptText(SAY_GRATS_JINDO, jTemp); @@ -175,7 +175,7 @@ class boss_mandokir : public CreatureScript else { DoCast(pUnit, SPELL_CHARGE); - //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true, 1); AttackStart(pUnit); } } @@ -186,7 +186,7 @@ class boss_mandokir : public CreatureScript if ((Watch_Timer < 8000) && !someWatched) //8 sec(cast time + expire time) before the check for the watch effect mandokir will cast watch debuff on a random target { - if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoScriptText(SAY_WATCH, me, p); DoCast(p, SPELL_WATCH); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 8674a821517..ad6950c8f30 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -118,22 +118,22 @@ class boss_marli : public CreatureScript { DoScriptText(SAY_SPIDER_SPAWN, me); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; Creature *Spider = NULL; - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); - Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); @@ -142,11 +142,11 @@ class boss_marli : public CreatureScript if (SpawnSpider_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) return; - Creature *Spider = me->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature *Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) Spider->AI()->AttackStart(pTarget); SpawnSpider_Timer = 12000 + rand()%5000; @@ -163,10 +163,10 @@ class boss_marli : public CreatureScript DoCast(me->getVictim(), SPELL_ENVOLWINGWEB); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-100); + DoModifyThreatPercent(me->getVictim(), -100); PhaseTwo = true; - Transform_Timer = urand(35000,60000); + Transform_Timer = urand(35000, 60000); } else Transform_Timer -= diff; if (PhaseTwo) @@ -178,7 +178,7 @@ class boss_marli : public CreatureScript while (i < 3) // max 3 tries to get a random target with power_mana { ++i; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1, 100, true); // not aggro leader + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader if (pTarget && pTarget->getPowerType() == POWER_MANA) i = 3; } @@ -186,7 +186,7 @@ class boss_marli : public CreatureScript { DoCast(pTarget, SPELL_CHARGE); //me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); AttackStart(pTarget); } @@ -202,7 +202,7 @@ class boss_marli : public CreatureScript me->UpdateDamagePhysical(BASE_ATTACK); PhaseTwo = false; - TransformBack_Timer = urand(25000,40000); + TransformBack_Timer = urand(25000, 40000); } else TransformBack_Timer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 191d9f311b2..b5550e6e740 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -93,7 +93,7 @@ class boss_renataki : public CreatureScript if (Ambush_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); @@ -127,10 +127,10 @@ class boss_renataki : public CreatureScript if (Aggro_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-50); + DoModifyThreatPercent(me->getVictim(), -50); if (pTarget) AttackStart(pTarget); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 56b2fd34872..796124be1dd 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript { if (Charge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_CHARGE); DoResetThreat(); @@ -343,7 +343,7 @@ class mob_zealot_lorkhan : public CreatureScript if (!pThekal || !pZath) return; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: if (me->IsWithinMeleeRange(pThekal)) @@ -500,7 +500,7 @@ class mob_zealot_zath : public CreatureScript DoCast(me->getVictim(), SPELL_GOUGE); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-100); + DoModifyThreatPercent(me->getVictim(), -100); Gouge_Timer = 17000+rand()%10000; } else Gouge_Timer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 4aaff206375..a623c8e3760 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript TargetInRange = 0; for (uint8 i = 0; i < 10; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,i)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) if (me->IsWithinMeleeRange(pTarget)) ++TargetInRange; } @@ -144,7 +144,7 @@ class boss_venoxis : public CreatureScript if (HolyFire_Timer < diff && TargetInRange < 3) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_HOLY_FIRE); HolyFire_Timer = 8000; @@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript if (PhaseTwo && VenomSpit_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_VENOMSPIT); VenomSpit_Timer = 15000 + rand()%5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 944a33fb620..e6e38b761ee 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -71,7 +71,7 @@ class boss_wushoolay : public CreatureScript if (LightningWave_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); LightningWave_Timer = 12000 + rand()%4000; diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index d893811db55..5c1a1d77b0d 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -72,13 +72,13 @@ public: void KilledUnit(Unit* /*victim*/) { - // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70,000 health. + // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70, 000 health. DoCast(me, SPELL_CAPTURESOUL); } void SummonHounds(Unit* pVictim) { - if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9,9)), float(irand(-9,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + if (Creature *Hound = DoSpawnCreature(19207, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) Hound->AI()->AttackStart(pVictim); } @@ -91,7 +91,7 @@ public: //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - if (urand(0,99) < 45) + if (urand(0, 99) < 45) DoCast(me->getVictim(), SPELL_SHADOWVOLLEY); ShadowVolley_Timer = 5000; @@ -100,7 +100,7 @@ public: //Cleave_Timer if (Cleave_Timer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoCast(me->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; @@ -109,7 +109,7 @@ public: //ThunderClap_Timer if (ThunderClap_Timer <= diff) { - if (urand(0,9) < 2) + if (urand(0, 9) < 2) DoCast(me->getVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 12000; @@ -125,7 +125,7 @@ public: //VoidBolt_Timer if (VoidBolt_Timer <= diff) { - if (urand(0,9) < 4) + if (urand(0, 9) < 4) DoCast(me->getVictim(), SPELL_VOIDBOLT); VoidBolt_Timer = 18000; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 4071087d860..6a550d55a0b 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -38,16 +38,16 @@ public: { if (pPlayer->HasQuestForItem(21149)) { - if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16f,-489.57f,49.95f,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) + if (Unit* TCorrupter = pPlayer->SummonCreature(15625, -10328.16f, -489.57f, 49.95f, 0, TEMPSUMMON_MANUAL_DESPAWN, 60000)) { TCorrupter->setFaction(14); TCorrupter->SetMaxHealth(832750); } - if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()-1,0,TEMPSUMMON_TIMED_DESPAWN,15000)) + if (Unit* CorrupterSpeaker = pPlayer->SummonCreature(1, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000)) { CorrupterSpeaker->SetName("Twilight Corrupter"); CorrupterSpeaker->SetVisible(true); - CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...",0,pPlayer->GetGUID()); + CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, pPlayer->GetGUID()); } } return false; @@ -89,7 +89,7 @@ public: } void EnterCombat(Unit* /*who*/) { - me->MonsterYell("The Nightmare cannot be stopped!",0,me->GetGUID()); + me->MonsterYell("The Nightmare cannot be stopped!", 0, me->GetGUID()); } void KilledUnit(Unit* victim) @@ -97,7 +97,7 @@ public: if (victim->GetTypeId() == TYPEID_PLAYER) { ++KillCount; - me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(),true); + me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(), true); if (KillCount == 3) { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 13f69b90d1b..c4bd0e022a4 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -420,16 +420,16 @@ public: switch(paladinPhase) { case 0: - DoScriptText(TEXT_SECOND_TRIAL_1,me); + DoScriptText(TEXT_SECOND_TRIAL_1, me); break; case 1: - DoScriptText(TEXT_SECOND_TRIAL_2,me); + DoScriptText(TEXT_SECOND_TRIAL_2, me); break; case 2: - DoScriptText(TEXT_SECOND_TRIAL_3,me); + DoScriptText(TEXT_SECOND_TRIAL_3, me); break; case 3: - DoScriptText(TEXT_SECOND_TRIAL_4,me); + DoScriptText(TEXT_SECOND_TRIAL_4, me); break; } } @@ -492,7 +492,7 @@ void npc_second_trial_paladin::npc_secondTrialAI::JustDied(Unit* Killer) if (me->GetEntry() == CHAMPION_SUNSTRIKER) { if (Killer->GetTypeId() == TYPEID_PLAYER) - Killer->ToPlayer()->GroupEventHappens(QUEST_SECOND_TRIAL,Killer); + Killer->ToPlayer()->GroupEventHappens(QUEST_SECOND_TRIAL, Killer); } } } @@ -690,7 +690,7 @@ public: if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID)) CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES); - me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); me->RemoveCorpse(); } else EndTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 83faaf36dfe..31a574ccef8 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -62,7 +62,7 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true)) + if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226, 1, true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); @@ -211,7 +211,7 @@ public: case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); break; case 30: if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,me); + CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS, me); break; case 32: me->SetOrientation(2.978281f); diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index f9925feda74..75cf7d481a8 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -250,7 +250,7 @@ public: return; //only if attacked and escorter is not in combat? - DoScriptText(RAND(SAY_RIN_HELP_1,SAY_RIN_HELP_2), me); + DoScriptText(RAND(SAY_RIN_HELP_1, SAY_RIN_HELP_2), me); } } diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index 4a0d59b02f8..7fbf32875e1 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -71,7 +71,7 @@ public: { if (Timer <= diff) { - uint32 i = urand(1,2); + uint32 i = urand(1, 2); if (i == 1) DoScriptText(SAY_CONVERTED_1, me); else diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index 71aaa4158c3..f104d104583 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -47,7 +47,7 @@ public: { if (pQuest->GetQuestId() == QUEST_MISSING_IN_ACTION) { - CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI,pCreature->AI())->Start(true, false, pPlayer->GetGUID(),pQuest); + CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID(), pQuest); DoScriptText(SAY_CORPORAL_1, pCreature); } @@ -123,12 +123,12 @@ public: uiPhase = 2; break; case 2: - DoScriptText(SAY_CORPORAL_2,me); + DoScriptText(SAY_CORPORAL_2, me); uiTimer = 15000; uiPhase = 3; break; case 3: - DoScriptText(SAY_CORPORAL_3,me); + DoScriptText(SAY_CORPORAL_3, me); me->SetStandState(UNIT_STAND_STATE_STAND); SetEscortPaused(false); uiTimer = 0; @@ -151,13 +151,13 @@ public: if (uiMockingBlowTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_MOCKING_BLOW); + DoCast(me->getVictim(), SPELL_MOCKING_BLOW); uiMockingBlowTimer = 5000; } else uiMockingBlowTimer -= uiDiff; if (uiShieldBashTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_MOCKING_BLOW); + DoCast(me->getVictim(), SPELL_MOCKING_BLOW); uiShieldBashTimer = 8000; } else uiShieldBashTimer -= uiDiff; diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp index 7a9d7efb347..f99fa6119c3 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp @@ -62,7 +62,7 @@ public: { lifeTimer = 120000; me->SetStandState(UNIT_STAND_STATE_DEAD); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,7); // lay down + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 7); // lay down spellHit = false; } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 9ae10832e28..a1c75f4bbc5 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -170,7 +170,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me, who); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me, who); } }; diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 76af8e4460e..0cd539c1101 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -356,9 +356,9 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE, -8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { - pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977f, 468.611450f, 123.759903f); + pMarzon->GetMotionMaster()->MovePoint(0, -8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); } uiTimer = 2000; @@ -370,7 +370,7 @@ public: void DoGuardsDisappearAndDie() { std::list<Creature*> GuardList; - me->GetCreatureListWithEntryInGrid(GuardList,NPC_STORMWIND_ROYAL,8.0f); + me->GetCreatureListWithEntryInGrid(GuardList, NPC_STORMWIND_ROYAL, 8.0f); if (!GuardList.empty()) { for (std::list<Creature*>::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) @@ -607,7 +607,7 @@ public: uiPhase = 2; break; case 2: - if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION,10.0f)) + if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 10.0f)) DoScriptText(SAY_TYRION_1, pTyrion); uiTimer = 3000; uiPhase = 3; @@ -639,7 +639,7 @@ public: uiPhase = 0; break; case 8: - if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR,10.0f)) + if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f)) DoScriptText(SAY_LESCOVAR_1, pLescovar); uiTimer = 3000; uiPhase = 9; @@ -650,11 +650,11 @@ public: uiPhase = 10; break; case 10: - if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR,10.0f)) + if (Creature* pLescovar = me->FindNearestCreature(NPC_LORD_GREGOR_LESCOVAR, 10.0f)) { if (Player* pPlayer = GetPlayerForEscort()) { - CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI,pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f); } } @@ -696,8 +696,8 @@ public: { if (Creature* pSpybot = pCreature->FindNearestCreature(NPC_TYRION_SPYBOT, 5.0f, true)) { - CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI,pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); - CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI,pSpybot->AI())->SetMaxPlayerDistance(200.0f); + CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->Start(false, false, pPlayer->GetGUID()); + CAST_AI(npc_tyrion_spybot::npc_tyrion_spybotAI, pSpybot->AI())->SetMaxPlayerDistance(200.0f); } return true; } diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 6b68ac58ea3..1e220276a96 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -80,8 +80,8 @@ public: me->RestoreFaction(); - if (!me->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE)) - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); } void EnterCombat(Unit* /*who*/) {} @@ -101,7 +101,7 @@ public: uiDamage = 0; me->RestoreFaction(); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->CombatStop(true); m_uiPhase = 1; @@ -201,7 +201,7 @@ public: if (GameObject* pDoor = pPlayer->FindNearestGameObject(GO_DOOR, 30.0f)) { pGo->SetGoState(GO_STATE_ACTIVE); - pDoor->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + pDoor->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); return true; } diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 4b0ac365181..ea78f0892e0 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -107,9 +107,9 @@ public: { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit *pTarget = Unit::GetUnit(*summoned,targetGUID)) + if (Unit *pTarget = Unit::GetUnit(*summoned, targetGUID)) { - pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f,0); + pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0); pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); } @@ -186,8 +186,8 @@ public: if (EventMove_Timer <= diff) { me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->SendMonsterMoveWithSpeed(me->GetPositionX(),me->GetPositionY(),HIGHBORNE_LOC_Y_NEW,5000); - me->GetMap()->CreatureRelocation(me,me->GetPositionX(),me->GetPositionY(),HIGHBORNE_LOC_Y_NEW,me->GetOrientation()); + me->SendMonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, 5000); + me->GetMap()->CreatureRelocation(me, me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetOrientation()); EventMove = false; } else EventMove_Timer -= diff; } @@ -225,7 +225,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false); + pCreature->CastSpell(pPlayer, SPELL_MARK_OF_SHAME, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 3ef6b7f689c..6534fd4d0e9 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -213,7 +213,7 @@ public: if (CAST_PLR(who)->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE || CAST_PLR(who)->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE) { - me->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoDie(); } break; @@ -221,7 +221,7 @@ public: if (CAST_PLR(who)->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE || CAST_PLR(who)->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE) { - me->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoDie(); } break; @@ -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 5b6c377a37e..424d5427238 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -246,14 +246,14 @@ public: DoScriptText(SAY_END, me, pPlayer); { if (pPlayer) - pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD,me); + pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD, me); } break; } } void EnterCombat(Unit* who) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me, who); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me, who); } void Reset() {} diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 7cc62b1d49d..85609aab584 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -112,7 +112,7 @@ class example_creature : public CreatureScript m_uiPhase = 1; // Start in phase 1 m_uiPhaseTimer = 60000; // 60 seconds m_uiSpell1Timer = 5000; // 5 seconds - m_uiSpell2Timer = urand(10000,20000); // between 10 and 20 seconds + m_uiSpell2Timer = urand(10000, 20000); // between 10 and 20 seconds m_uiSpell3Timer = 19000; // 19 seconds m_uiBeserkTimer = 120000; // 2 minutes @@ -170,7 +170,7 @@ class example_creature : public CreatureScript if (m_uiSayTimer <= uiDiff) { //Random switch between 5 outcomes - DoScriptText(RAND(SAY_RANDOM_0,SAY_RANDOM_1,SAY_RANDOM_2,SAY_RANDOM_3,SAY_RANDOM_4), me); + DoScriptText(RAND(SAY_RANDOM_0, SAY_RANDOM_1, SAY_RANDOM_2, SAY_RANDOM_3, SAY_RANDOM_4), me); m_uiSayTimer = 45000; //Say something agian in 45 seconds } diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 6dfb21bf3f8..212ed450ed5 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -245,7 +245,7 @@ class spell_ex_66244 : public SpellScriptLoader { OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_ex_66244AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic,EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_DUMMY); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_ex_66244AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_ex_66244AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_DUMMY); DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_ex_66244AuraScript::HandleEffectCalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index c66eb20f3c7..424ddcc16e4 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -30,7 +30,7 @@ enum eSpells #define GOSSIP_ITEM_MORRIDUNE "Please port me to Darnassus" -const Position HomePosition = {-815.817f,-145.299f,-25.870f, 0}; +const Position HomePosition = {-815.817f, -145.299f, -25.870f, 0}; class go_blackfathom_altar : public GameObjectScript { @@ -40,7 +40,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGo*/) { if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) - pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM,pPlayer); + pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer); return true; } @@ -102,9 +102,9 @@ public: { bFlee = false; - uiRavageTimer = urand(5000,8000); - uiFrostNovaTimer = urand(9000,12000); - uiFrostBoltVolleyTimer = urand(2000,4000); + uiRavageTimer = urand(5000, 8000); + uiFrostNovaTimer = urand(9000, 12000); + uiFrostBoltVolleyTimer = urand(2000, 4000); } void AttackPlayer() @@ -143,7 +143,7 @@ public: if (uiRavageTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_RAVAGE); - uiRavageTimer = urand(9000,14000); + uiRavageTimer = urand(9000, 14000); } else uiRavageTimer -= uiDiff; break; } @@ -161,17 +161,17 @@ public: { if (uiFrostBoltVolleyTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) DoCast(pTarget, SPELL_FROST_BOLT_VOLLEY); } - uiFrostBoltVolleyTimer = urand(5000,8000); + uiFrostBoltVolleyTimer = urand(5000, 8000); } else uiFrostBoltVolleyTimer -= uiDiff; if (uiFrostNovaTimer <= uiDiff) { - DoCastAOE(SPELL_FROST_NOVA,false); - uiFrostNovaTimer = urand(25000,30000); + DoCastAOE(SPELL_FROST_NOVA, false); + uiFrostNovaTimer = urand(25000, 30000); } else uiFrostNovaTimer -= uiDiff; break; } @@ -207,7 +207,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->TeleportTo(1,9952.239f,2284.277f,1341.394f,1.595f); + pPlayer->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -231,9 +231,9 @@ public: { npc_morriduneAI(Creature* pCreature) : npc_escortAI(pCreature) { - DoScriptText(SAY_MORRIDUNE_1,pCreature); + DoScriptText(SAY_MORRIDUNE_1, pCreature); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - Start(false,false,0); + Start(false, false, 0); } void WaypointReached(uint32 uiPoint) @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2,me); + DoScriptText(SAY_MORRIDUNE_2, me); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 3580b3d4c30..fabe4ce7526 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -48,7 +48,7 @@ public: void Reset() { - uiPoisonCloudTimer = urand(5000,9000); + uiPoisonCloudTimer = urand(5000, 9000); bIsEnraged = false; if (pInstance) pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED); @@ -74,12 +74,12 @@ public: if (uiPoisonCloudTimer < diff) { DoCastVictim(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(25000,50000); + uiPoisonCloudTimer = urand(25000, 50000); } else uiPoisonCloudTimer -= diff; if (!bIsEnraged && HealthBelowPct(30)) { - DoCast(me,SPELL_FRENZIED_RAGE); + DoCast(me, SPELL_FRENZIED_RAGE); bIsEnraged = true; } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 9eec90ad02f..88b6382c105 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -46,7 +46,7 @@ public: void Reset() { - uiNetTimer = urand(2000,4000); + uiNetTimer = urand(2000, 4000); if (pInstance) pInstance->SetData(TYPE_GELIHAST, NOT_STARTED); } @@ -71,7 +71,7 @@ public: if (uiNetTimer < diff) { DoCastVictim(SPELL_NET); - uiNetTimer = urand(4000,7000); + uiNetTimer = urand(4000, 7000); } else uiNetTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 5833cb2d123..471d4663b0c 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -56,8 +56,8 @@ public: void Reset() { - uiMindBlastTimer = urand(2000,5000); - uiSleepTimer = urand(9000,12000); + uiMindBlastTimer = urand(2000, 5000); + uiSleepTimer = urand(9000, 12000); if (pInstance) pInstance->SetData(TYPE_KELRIS, NOT_STARTED); } @@ -84,7 +84,7 @@ public: if (uiMindBlastTimer < diff) { DoCastVictim(SPELL_MIND_BLAST); - uiMindBlastTimer = urand(7000,9000); + uiMindBlastTimer = urand(7000, 9000); } else uiMindBlastTimer -= diff; if (uiSleepTimer < diff) @@ -94,7 +94,7 @@ public: DoScriptText(SAY_SLEEP, me); DoCast(pTarget, SPELL_SLEEP); } - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index c1fb711e5fd..0b0e9076fc1 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -102,7 +102,7 @@ public: m_uiTwilightLordKelrisGUID = creature->GetGUID(); break; case NPC_LORGUS_JETT: - creature->SetHomePosition(LorgusPosition[urand(0,3)]); + creature->SetHomePosition(LorgusPosition[urand(0, 3)]); break; } } @@ -135,7 +135,7 @@ public: break; case GO_AKU_MAI_DOOR: if (m_auiEncounter[2] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); m_uiMainDoorGUID = go->GetGUID(); break; } @@ -157,7 +157,7 @@ public: if (GameObject* go = instance->GetGameObject(m_uiAltarOfTheDeepsGUID)) { go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - go->SummonCreature(NPC_MORRIDUNE,SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); } break; case DATA_FIRE: @@ -206,7 +206,7 @@ public: case DATA_EVENT: uiDeathTimes = uiData; if (uiDeathTimes == 18) - HandleGameObject(m_uiMainDoorGUID,true); + HandleGameObject(m_uiMainDoorGUID, true); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 3bd68634571..978b0b822b1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -106,7 +106,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -130,7 +130,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -177,8 +177,8 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CARRION_SWARM); - SwarmTimer = urand(45000,60000); - switch (urand(0,1)) + SwarmTimer = urand(45000, 60000); + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SWARM1); @@ -196,10 +196,10 @@ public: for (uint8 i = 0; i < 3; ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget,SPELL_SLEEP,true); + pTarget->CastSpell(pTarget, SPELL_SLEEP, true); } SleepTimer = 60000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SLEEP1); @@ -214,13 +214,13 @@ public: if (AuraTimer <= diff) { DoCast(me, SPELL_VAMPIRIC_AURA, true); - AuraTimer = urand(10000,20000); + AuraTimer = urand(10000, 20000); } else AuraTimer -= diff; if (InfernoTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_INFERNO1); @@ -297,7 +297,7 @@ public: { if (AnetheronGUID) { - Creature* boss = Unit::GetCreature((*me),AnetheronGUID); + Creature* boss = Unit::GetCreature((*me), AnetheronGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index e2fa3a69f96..8b2aa35e2ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -194,9 +194,9 @@ public: { if (ChangeTargetTimer <= diff) { - if (Unit *temp = Unit::GetUnit(*me,TargetGUID)) + if (Unit *temp = Unit::GetUnit(*me, TargetGUID)) { - me->GetMotionMaster()->MoveFollow(temp,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(temp, 0.0f, 0.0f); TargetGUID = 0; } else @@ -274,9 +274,9 @@ public: DrainNordrassilTimer = 0; FearTimer = 42000; AirBurstTimer = 30000; - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); DoomfireTimer = 20000; - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); SoulChargeCount = 0; MeleeRangeCheckTimer = 15000; HandOfDeathTimer = 2000; @@ -303,7 +303,7 @@ public: void KilledUnit(Unit * victim) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) GainSoulCharge(CAST_PLR(victim)); @@ -330,7 +330,7 @@ public: break; } - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); ++SoulChargeCount; } @@ -397,12 +397,12 @@ public: if (summoned->GetEntry() == CREATURE_DOOMFIRE) { - summoned->CastSpell(summoned,SPELL_DOOMFIRE_SPAWN,false); - summoned->CastSpell(summoned,SPELL_DOOMFIRE,true,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_DOOMFIRE_SPAWN, false); + summoned->CastSpell(summoned, SPELL_DOOMFIRE, true, 0, 0, me->GetGUID()); if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) { - summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit,0.0f,0.0f); + summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit, 0.0f, 0.0f); DoomfireSpiritGUID = 0; } } @@ -412,11 +412,11 @@ public: void SummonDoomfire(Unit *pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0f,pTarget->GetPositionY()+15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()+15.0f, pTarget->GetPositionY()+15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0f,pTarget->GetPositionY()-15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()-15.0f, pTarget->GetPositionY()-15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } @@ -428,7 +428,7 @@ public: uint32 chargeSpell = 0; uint32 unleashSpell = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: chargeSpell = SPELL_SOUL_CHARGE_RED; @@ -453,7 +453,7 @@ public: } if (HasCast) - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); } void UpdateAI(const uint32 diff) @@ -584,18 +584,18 @@ public: if (GripOfTheLegionTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); } else GripOfTheLegionTimer -= diff; if (AirBurstTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_AIR_BURST1, me); else DoScriptText(SAY_AIR_BURST2, me); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank - AirBurstTimer = urand(25000,40000); + AirBurstTimer = urand(25000, 40000); } else AirBurstTimer -= diff; if (FearTimer <= diff) @@ -606,7 +606,7 @@ public: if (DoomfireTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_DOOMFIRE1, me); else DoScriptText(SAY_DOOMFIRE2, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 3959337bc49..77a3549dbc3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -99,7 +99,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -123,7 +123,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -166,13 +166,13 @@ public: if (RainTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true), SPELL_RAIN_OF_FIRE); RainTimer = 20000+rand()%15000; } else RainTimer -= diff; if (DoomTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_DOOM);//never on tank DoomTimer = 45000+rand()%5000; } else DoomTimer -= diff; @@ -267,7 +267,7 @@ public: { if (AzgalorGUID) { - Creature* boss = Unit::GetCreature((*me),AzgalorGUID); + Creature* boss = Unit::GetCreature((*me), AzgalorGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index fc3abbaab9f..86e1348f399 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -118,7 +118,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -184,14 +184,14 @@ public: Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) { - pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users + pTarget->CastSpell(pTarget, SPELL_MARK, true);//only cast on mana users } } MarkTimerBase -= 5000; if (MarkTimerBase < 5500) MarkTimerBase = 5500; MarkTimer = MarkTimerBase; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_MARK1); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 295727c44ac..fdd046b454f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -114,7 +114,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -165,7 +165,7 @@ public: { DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_DECAY1); @@ -181,7 +181,7 @@ public: { DoCast(me->getVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_NOVA1); @@ -195,7 +195,7 @@ public: } else NovaTimer -= diff; if (IceboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_ICEBOLT); IceboltTimer = 11000+rand()%20000; } else IceboltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 26aa3fd7cfc..1394ec232fd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -223,7 +223,7 @@ public: { Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); if (item && pPlayer) - pPlayer->SendNewItem(item,1,true,false,true); + pPlayer->SendNewItem(item, 1, true, false, true); } pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); CAST_AI(hyjalAI, pCreature->AI()); @@ -237,7 +237,7 @@ public: uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); // Only let them get item if Azgalor is dead. - if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) + if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 38ffeeed042..1db2a350dac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -72,8 +72,8 @@ float HordeBase[4][3]= // Lady Jaina's waypoints when retreathing float JainaWPs[2][3]= { - {5078.56f, -1789.79f, 1320.73f},//next to the small stairs - {5037.38f, -1778.39f, 1322.61f},//center of alliance base + {5078.56f, -1789.79f, 1320.73f}, //next to the small stairs + {5037.38f, -1778.39f, 1322.61f}, //center of alliance base }; float InfernalPos[8][3]=//spawn points for the infernals in the horde base @@ -138,10 +138,10 @@ float VeinPos[14][8]=//spawn points of the ancient gem veins float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun { - {5279.94f, -2049.68f, 1311.38f, 0},//garg1 - {5289.15f, -2219.06f, 1291.12f, 0},//garg2 - {5202.07f, -2136.10f, 1305.07f, 2.8f},//garg3 - {5071.52f, -2425.63f, 1454.48f, 5.54f},//garg4 + {5279.94f, -2049.68f, 1311.38f, 0}, //garg1 + {5289.15f, -2219.06f, 1291.12f, 0}, //garg2 + {5202.07f, -2136.10f, 1305.07f, 2.8f}, //garg3 + {5071.52f, -2425.63f, 1454.48f, 5.54f}, //garg4 {5120.65f, -2467.92f, 1463.93f, 2.54f}//garg5 }; @@ -456,19 +456,19 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3)) {//summon at tower - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; }else{//summon at gate - pCreature = 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); + pCreature = 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 , if (FirstBossDead && WaveCount == 1) //summon at gate - pCreature = 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); + pCreature = 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 { - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1], SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; } @@ -652,27 +652,27 @@ void hyjalAI::Retreat() { if (pInstance) { - pInstance->SetData(TYPE_RETREAT,SPECIAL); + pInstance->SetData(TYPE_RETREAT, SPECIAL); if (Faction == 0) { pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); - AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]); - AddWaypoint(1,JainaWPs[1][0],JainaWPs[1][1],JainaWPs[1][2]); + AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]); + AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } if (Faction == 1) { pInstance->SetData(DATA_HORDE_RETREAT, 1); - Creature* JainaDummy = me->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000); + Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000); if (JainaDummy) { JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true; DummyGuid = JainaDummy->GetGUID(); } - AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]); + AddWaypoint(0, JainaDummySpawn[1][0], JainaDummySpawn[1][1], JainaDummySpawn[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } @@ -690,7 +690,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 0; i<7; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -700,7 +700,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 7; i<14; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -714,7 +714,7 @@ void hyjalAI::DeSpawnVeins() return; if (Faction == 1) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -725,7 +725,7 @@ void hyjalAI::DeSpawnVeins() } } else if (Faction) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_THRALL)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -760,7 +760,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(me->GetPositionX(), me->GetPositionY()); HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); } else me->SetVisible(true); @@ -773,7 +773,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(5563, -2763.19f); HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); } else me->SetVisible(true); @@ -975,14 +975,14 @@ void hyjalAI::WaypointReached(uint32 i) { if (i == 1 || (i == 0 && me->GetEntry() == THRALL)) { - me->MonsterYell(YELL_HURRY,0,0); + me->MonsterYell(YELL_HURRY, 0, 0); WaitForTeleport = true; TeleportTimer = 20000; if (me->GetEntry() == JAINA) DoCast(me, SPELL_MASS_TELEPORT, false); if (me->GetEntry() == THRALL && DummyGuid) { - Unit* Dummy = Unit::GetUnit((*me),DummyGuid); + Unit* Dummy = Unit::GetUnit((*me), DummyGuid); if (Dummy) { CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; @@ -1021,7 +1021,7 @@ void hyjalAI::WaypointReached(uint32 i) float range = 10; if (me->GetEntry() == THRALL)range = 20; me->GetNearPoint(me, x, y, z, range, 0, me->GetAngle((*itr))); - (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), me->GetPositionZ()); + (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5, 5), y+irand(-5, 5), me->GetPositionZ()); } } } @@ -1075,12 +1075,12 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); 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); + 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) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1092,7 +1092,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) 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); + 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) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1116,7 +1116,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) break; case 1://horde for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); for (uint8 i = 0; i < 26; ++i)//summon infernals { @@ -1133,7 +1133,7 @@ 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, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + 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) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1145,7 +1145,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) 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); + 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) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 93450203aa0..c0be18cdb7f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -33,7 +33,7 @@ float HordeWPs[8][3]=//basic waypoints from spawn to leader {5554.58f, -2514.66f, 1476.12f}, {5554.16f, -2567.23f, 1479.90f}, {5540.67f, -2625.99f, 1480.89f}, - {5508.16f, -2659.20f, 1480.15f},//random rush starts from here + {5508.16f, -2659.20f, 1480.15f}, //random rush starts from here {5489.62f, -2704.05f, 1482.18f}, {5457.04f, -2726.26f, 1485.10f} }; @@ -43,7 +43,7 @@ float AllianceWPs[8][3]=//basic waypoints from spawn to leader {4898.68f, -1615.02f, 1329.48f}, {4907.12f, -1667.08f, 1321.00f}, {4963.18f, -1699.35f, 1340.51f}, - {4989.16f, -1716.67f, 1335.74f},//first WP in the base, after the gate + {4989.16f, -1716.67f, 1335.74f}, //first WP in the base, after the gate {5026.27f, -1736.89f, 1323.02f}, {5037.77f, -1770.56f, 1324.36f}, {5067.23f, -1789.95f, 1321.17f} @@ -72,87 +72,87 @@ float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde bas float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave { - {4976.37f,-1708.02f,1339.43f},//0spawn - {4994.83f,-1725.52f,1333.25f},//1 start - {4982.92f,-1753.7f,1330.69f},//2 end - {4996.75f,-1721.47f,1332.95f},//3 start - {5015.74f,-1755.05f,1322.49f},//4 - {4998.68f,-1773.44f,1329.59f},//5 - {4994.83f,-1725.52f,1333.25f},//6 start - {5022.8f,-1735.46f,1323.53f},//7 - {5052.15f,-1729.02f,1320.88f},//8 - {5082.43f,-1726.29f,1327.87f},//9 - {4994.83f,-1725.52f,1333.25f},//10 start - {5018.92f,-1751.14f,1322.19f},//11 - {5040.09f,-1792.09f,1322.1f},//12 - {4994.83f,-1725.52f,1333.25f},//13 start - {5023.47f,-1748.1f,1322.51f},//14 - {5013.43f,-1842.39f,1322.07f},//15 - {4994.83f,-1725.52f,1333.25f},//16 start - {5020.8f,-1756.86f,1322.2f},//17 - {5019.53f,-1824.6f,1321.96f},//18 - {5043.42f,-1853.75f,1324.52f},//19 - {5053.02f,-1864.13f,1330.36f},//20 - {5062.49f,-1852.47f,1330.49f},//21 - {5015.27f, -1738.77f, 1324.83f},//35//start 22 - {5027.97f, -1775.25f, 1321.87f},//34 23 - {5015.94f, -1821.24f, 1321.86f},//33 24 - {4983.25f, -1857.4f, 1320.48f},//32 25 - {4981.51f, -1883.7f, 1322.34f},//31 26 - {5002.33f, -1893.98f, 1325.88f},//30 27 - {5049.32f, -1886.54f, 1331.69f},//29 28 - {5089.68f, -1846.88f, 1328.99f},//28 29 - {5127.90f, -1825.14f, 1335.58f},//27 30 - {5163.27f, -1789.08f, 1337.04f},//26 31 - {5138.97f, -1755.88f, 1334.57f},//25 32 - {5096.63f, -1742.22f, 1329.61f},//24 33 - {5065.81f, -1729.43f, 1325.66f},//23 34 - {5049.32f, -1726.31f, 1320.64f},//22 start - {5081.07f, -1902.10f, 1346.36f},//36 abo start - {5107.65f, -1912.03f, 1356.49f},//37 - {5132.83f, -1927.07f, 1362.42f},//38 - {5147.78f, -1954.41f, 1365.98f},//39 - {5164.96f, -1966.48f, 1367.04f},//40 - {5189.04f, -1961.06f, 1367.90f},//41 - {5212.27f, -1975.30f, 1365.58f},//42 - {5221.82f, -1994.18f, 1364.97f},//43 end1 - {5202.23f, -1994.94f, 1367.59f},//44 end2 - {5279.94f, -2049.68f, 1311.38f},//45 garg1 - {5289.15f, -2219.06f, 1291.12f},//46 garg2 - {5202.07f, -2136.10f, 1305.07f},//47 garg3 - {5071.52f, -2425.63f, 1454.48f},//48 garg4 - {5120.65f, -2467.92f, 1463.93f},//49 garg5 - {5283.04f, -2043.26f, 1300.11f},//50 garg target1 - {5313.22f, -2207.60f, 1290.06f},//51 garg target2 - {5180.41f, -2121.87f, 1292.62f},//52 garg target3 - {5088.68f, -2432.04f, 1441.73f},//53 garg target4 + {4976.37f, -1708.02f, 1339.43f}, //0spawn + {4994.83f, -1725.52f, 1333.25f}, //1 start + {4982.92f, -1753.7f, 1330.69f}, //2 end + {4996.75f, -1721.47f, 1332.95f}, //3 start + {5015.74f, -1755.05f, 1322.49f}, //4 + {4998.68f, -1773.44f, 1329.59f}, //5 + {4994.83f, -1725.52f, 1333.25f}, //6 start + {5022.8f, -1735.46f, 1323.53f}, //7 + {5052.15f, -1729.02f, 1320.88f}, //8 + {5082.43f, -1726.29f, 1327.87f}, //9 + {4994.83f, -1725.52f, 1333.25f}, //10 start + {5018.92f, -1751.14f, 1322.19f}, //11 + {5040.09f, -1792.09f, 1322.1f}, //12 + {4994.83f, -1725.52f, 1333.25f}, //13 start + {5023.47f, -1748.1f, 1322.51f}, //14 + {5013.43f, -1842.39f, 1322.07f}, //15 + {4994.83f, -1725.52f, 1333.25f}, //16 start + {5020.8f, -1756.86f, 1322.2f}, //17 + {5019.53f, -1824.6f, 1321.96f}, //18 + {5043.42f, -1853.75f, 1324.52f}, //19 + {5053.02f, -1864.13f, 1330.36f}, //20 + {5062.49f, -1852.47f, 1330.49f}, //21 + {5015.27f, -1738.77f, 1324.83f}, //35//start 22 + {5027.97f, -1775.25f, 1321.87f}, //34 23 + {5015.94f, -1821.24f, 1321.86f}, //33 24 + {4983.25f, -1857.4f, 1320.48f}, //32 25 + {4981.51f, -1883.7f, 1322.34f}, //31 26 + {5002.33f, -1893.98f, 1325.88f}, //30 27 + {5049.32f, -1886.54f, 1331.69f}, //29 28 + {5089.68f, -1846.88f, 1328.99f}, //28 29 + {5127.90f, -1825.14f, 1335.58f}, //27 30 + {5163.27f, -1789.08f, 1337.04f}, //26 31 + {5138.97f, -1755.88f, 1334.57f}, //25 32 + {5096.63f, -1742.22f, 1329.61f}, //24 33 + {5065.81f, -1729.43f, 1325.66f}, //23 34 + {5049.32f, -1726.31f, 1320.64f}, //22 start + {5081.07f, -1902.10f, 1346.36f}, //36 abo start + {5107.65f, -1912.03f, 1356.49f}, //37 + {5132.83f, -1927.07f, 1362.42f}, //38 + {5147.78f, -1954.41f, 1365.98f}, //39 + {5164.96f, -1966.48f, 1367.04f}, //40 + {5189.04f, -1961.06f, 1367.90f}, //41 + {5212.27f, -1975.30f, 1365.58f}, //42 + {5221.82f, -1994.18f, 1364.97f}, //43 end1 + {5202.23f, -1994.94f, 1367.59f}, //44 end2 + {5279.94f, -2049.68f, 1311.38f}, //45 garg1 + {5289.15f, -2219.06f, 1291.12f}, //46 garg2 + {5202.07f, -2136.10f, 1305.07f}, //47 garg3 + {5071.52f, -2425.63f, 1454.48f}, //48 garg4 + {5120.65f, -2467.92f, 1463.93f}, //49 garg5 + {5283.04f, -2043.26f, 1300.11f}, //50 garg target1 + {5313.22f, -2207.60f, 1290.06f}, //51 garg target2 + {5180.41f, -2121.87f, 1292.62f}, //52 garg target3 + {5088.68f, -2432.04f, 1441.73f}, //53 garg target4 {5111.26f, -2454.73f, 1449.63f}//54 garg target5 }; float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave { - {5490.72f,-2702.94f,1482.14f},//0 start - {5469.77f,-2741.34f,1486.95f}, - {5439.47f,-2771.02f,1494.59f}, - {5408.85f,-2811.92f,1505.68f}, - {5423.87f,-2857.80f,1515.55f}, - {5428.19f,-2898.15f,1524.61f}, - {5394.59f,-2930.05f,1528.23f}, - {5351.11f,-2935.80f,1532.24f}, - {5312.37f,-2959.06f,1536.21f}, - {5264.93f,-2989.80f,1545.70f}, - {5256.63f,-3056.16f,1559.24f}, - {5267.32f,-3119.55f,1575.36f}, - {5305.61f,-3139.88f,1586.38f}, - {5330.56f,-3135.37f,1588.58f}, - {5365.87f,-3139.78f,1583.96f}, - {5389.39f,-3163.57f,1582.57f},//15 end - {5500.86f,-2669.89f,1481.04f},//16 start - {5472.08f,-2715.14f,1483.55f}, - {5450.11f,-2721.47f,1485.61f}, - {5433.25f,-2712.93f,1493.02f},//19 end 1 - {5429.91f,-2718.44f,1493.42f}//20 end 2 + {5490.72f, -2702.94f, 1482.14f}, //0 start + {5469.77f, -2741.34f, 1486.95f}, + {5439.47f, -2771.02f, 1494.59f}, + {5408.85f, -2811.92f, 1505.68f}, + {5423.87f, -2857.80f, 1515.55f}, + {5428.19f, -2898.15f, 1524.61f}, + {5394.59f, -2930.05f, 1528.23f}, + {5351.11f, -2935.80f, 1532.24f}, + {5312.37f, -2959.06f, 1536.21f}, + {5264.93f, -2989.80f, 1545.70f}, + {5256.63f, -3056.16f, 1559.24f}, + {5267.32f, -3119.55f, 1575.36f}, + {5305.61f, -3139.88f, 1586.38f}, + {5330.56f, -3135.37f, 1588.58f}, + {5365.87f, -3139.78f, 1583.96f}, + {5389.39f, -3163.57f, 1582.57f}, //15 end + {5500.86f, -2669.89f, 1481.04f}, //16 start + {5472.08f, -2715.14f, 1483.55f}, + {5450.11f, -2721.47f, 1485.61f}, + {5433.25f, -2712.93f, 1493.02f}, //19 end 1 + {5429.91f, -2718.44f, 1493.42f}//20 end 2 }; hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) @@ -176,7 +176,7 @@ void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) { damageTaken += damage; if (pInstance) - pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage + pInstance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage } } @@ -196,56 +196,56 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2]); - me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2]); + me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2]); - me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2]); + me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; @@ -256,69 +256,69 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3,3), AllianceOverrunWP[1][1]+irand(-3,3), AllianceOverrunWP[1][2]); - AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2]); - me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2],0); + AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); + AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2]); + me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2], 0); SetDespawnAtEnd(false); LastOverronPos = 5; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3,3), AllianceOverrunWP[3][1]+irand(-3,3), AllianceOverrunWP[3][2]); - AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3,3), AllianceOverrunWP[4][1]+irand(-3,3), AllianceOverrunWP[4][2]); - AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2]); - me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2],0); + AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3, 3), AllianceOverrunWP[3][1]+irand(-3, 3), AllianceOverrunWP[3][2]); + AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3, 3), AllianceOverrunWP[4][1]+irand(-3, 3), AllianceOverrunWP[4][2]); + AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2]); + me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 2: - AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3,3), AllianceOverrunWP[6][1]+irand(-3,3), AllianceOverrunWP[6][2]); - AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3,3), AllianceOverrunWP[7][1]+irand(-3,3), AllianceOverrunWP[7][2]); - AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3,3), AllianceOverrunWP[8][1]+irand(-3,3), AllianceOverrunWP[8][2]); - AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2]); - me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2],0); + AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3, 3), AllianceOverrunWP[6][1]+irand(-3, 3), AllianceOverrunWP[6][2]); + AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3, 3), AllianceOverrunWP[7][1]+irand(-3, 3), AllianceOverrunWP[7][2]); + AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3, 3), AllianceOverrunWP[8][1]+irand(-3, 3), AllianceOverrunWP[8][2]); + AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2]); + me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2], 0); SetDespawnAtEnd(false); LastOverronPos = 7; Start(true, true); break; case 3: - AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3,3), AllianceOverrunWP[10][1]+irand(-3,3), AllianceOverrunWP[10][2]); - AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3,3), AllianceOverrunWP[11][1]+irand(-3,3), AllianceOverrunWP[11][2]); - AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2]); - me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2],0); + AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3, 3), AllianceOverrunWP[10][1]+irand(-3, 3), AllianceOverrunWP[10][2]); + AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3, 3), AllianceOverrunWP[11][1]+irand(-3, 3), AllianceOverrunWP[11][2]); + AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2]); + me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 4: - AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3,3), AllianceOverrunWP[13][1]+irand(-3,3), AllianceOverrunWP[13][2]); - AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3,3), AllianceOverrunWP[14][1]+irand(-3,3), AllianceOverrunWP[14][2]); - AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2]); - me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2],0); + AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3, 3), AllianceOverrunWP[13][1]+irand(-3, 3), AllianceOverrunWP[13][2]); + AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3, 3), AllianceOverrunWP[14][1]+irand(-3, 3), AllianceOverrunWP[14][2]); + AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2]); + me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 5: - AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3,3), AllianceOverrunWP[16][1]+irand(-3,3), AllianceOverrunWP[16][2]); - AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3,3), AllianceOverrunWP[17][1]+irand(-3,3), AllianceOverrunWP[17][2]); - AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3,3), AllianceOverrunWP[18][1]+irand(-3,3), AllianceOverrunWP[18][2]); - AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3,3), AllianceOverrunWP[19][1]+irand(-3,3), AllianceOverrunWP[19][2]); - AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3,3), AllianceOverrunWP[20][1]+irand(-3,3), AllianceOverrunWP[20][2]); - AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2]); - me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2],0); + AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3, 3), AllianceOverrunWP[16][1]+irand(-3, 3), AllianceOverrunWP[16][2]); + AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3, 3), AllianceOverrunWP[17][1]+irand(-3, 3), AllianceOverrunWP[17][2]); + AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3, 3), AllianceOverrunWP[18][1]+irand(-3, 3), AllianceOverrunWP[18][2]); + AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3, 3), AllianceOverrunWP[19][1]+irand(-3, 3), AllianceOverrunWP[19][2]); + AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3, 3), AllianceOverrunWP[20][1]+irand(-3, 3), AllianceOverrunWP[20][2]); + AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2]); + me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2], 0); SetDespawnAtEnd(false); LastOverronPos = 9; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; Start(true, true); @@ -331,32 +331,32 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]); - me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0); + me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; case 1: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]); - me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0); + me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; default: for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -366,9 +366,9 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-10, 10), HordeWPs[i][1]+irand(-10, 10), HordeWPs[i][2]); for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -436,7 +436,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -452,15 +452,15 @@ public: } if (!meteor) { - float x,y,z; - me->GetPosition(x,y,z); - Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000); + float x, y, z; + me->GetPosition(x, y, z); + Creature* trigger = me->SummonCreature(NPC_TRIGGER, x+8, y+8, z+25+rand()%10, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1000); if (trigger) { trigger->SetVisible(false); trigger->setFaction(me->getFaction()); trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - trigger->CastSpell(me,SPELL_METEOR,true); + trigger->CastSpell(me, SPELL_METEOR, true); } me->GetMotionMaster()->Clear(); meteor = true; @@ -477,7 +477,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -495,7 +495,7 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall + AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3), HordeWPs[7][1]+irand(-3, 3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall Start(true, true); SetDespawnAtEnd(false); } @@ -564,11 +564,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -598,13 +598,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -669,11 +669,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -705,13 +705,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -768,9 +768,9 @@ public: void JustSummoned(Creature* summon) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (pTarget && summon) - summon->Attack(pTarget,false); + summon->Attack(pTarget, false); summons.Summon(summon); } void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} @@ -783,29 +783,29 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } void KilledUnit(Unit* /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17902,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 1: - DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 2: - DoSpawnCreature(RAND(17902,17903),3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(RAND(17902, 17903), 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; } } @@ -827,13 +827,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); } @@ -899,11 +899,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -925,13 +925,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1000,11 +1000,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1026,13 +1026,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1092,11 +1092,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1118,13 +1118,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1187,7 +1187,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_FROST_BREATH, true); } } @@ -1198,11 +1198,11 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); } void EnterCombat(Unit* /*who*/) {} @@ -1230,7 +1230,7 @@ public: SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1309,7 +1309,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } @@ -1317,11 +1317,11 @@ public: void JustDied(Unit *victim) { - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); hyjal_trashAI::JustDied(victim); } @@ -1343,12 +1343,12 @@ public: if (!useFlyPath) { for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); + AddWaypoint(i, GargoyleWPs[i][0]+irand(-10, 10), GargoyleWPs[i][1]+irand(-10, 10), GargoyleWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1361,7 +1361,7 @@ public: { if (StrikeTimer <= diff) { - me->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); + me->CastSpell(DummyTarget[0], DummyTarget[1], DummyTarget[2], SPELL_GARGOYLE_STRIKE, false); StrikeTimer = 2000+rand()%1000; } else StrikeTimer -= diff; } @@ -1375,13 +1375,13 @@ public: { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) - me->Attack(pTarget,false); + me->Attack(pTarget, false); } if (MoveTimer <= diff) { - float x,y,z; - me->getVictim()->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); + float x, y, z; + me->getVictim()->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos); Zpos-=1.0f; if (Zpos <= 0)Zpos=0; MoveTimer = 2000; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index a2be655c9f5..847a1f36ed8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -191,7 +191,7 @@ 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* pUnit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); Map* pMap = creature->GetMap(); if (pMap->IsDungeon() && pUnit) @@ -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()); + pUnit->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); @@ -235,7 +235,7 @@ public: for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) { //don't know how long it expected - DoRespawnGameObject(*itr,DAY); + DoRespawnGameObject(*itr, DAY); } } } @@ -260,7 +260,7 @@ public: break; } - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)", type, data); if (data == DONE) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 7981bdbed7e..426fcf50fc0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -123,7 +123,7 @@ public: if (uiTimeWarpTimer < diff) { - DoScriptText(RAND(SAY_TIME_WARP_1,SAY_TIME_WARP_2,SAY_TIME_WARP_3), me); + DoScriptText(RAND(SAY_TIME_WARP_1, SAY_TIME_WARP_2, SAY_TIME_WARP_3), me); DoCastAOE(SPELL_TIME_WARP); uiTimeWarpTimer = 25300; } else uiTimeWarpTimer -= diff; @@ -144,7 +144,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; 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 b269587b19d..78d22aeb18a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -103,8 +103,8 @@ public: Phase = COMBAT; uiCarrionSwarmTimer = 6000; uiMindBlastTimer = 11000; - uiVampiricTouchTimer = urand(10000,15000); - uiSleepTimer = urand(15000,20000); + uiVampiricTouchTimer = urand(10000, 15000); + uiSleepTimer = urand(15000, 20000); uiOutroTimer = 1000; if (pInstance) @@ -184,10 +184,10 @@ public: if (uiSleepTimer < diff) { - DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), me); + DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SLEEP); - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); @@ -248,7 +248,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 7ad2ba18ff5..ff3ca08c3f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -61,7 +61,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiChainTimer; @@ -72,9 +72,9 @@ public: void Reset() { - uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16 - uiDiseaseTimer = urand(2000,4000); //approx 3s - uiFrenzyTimer = urand(21000,26000); //made it up + uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 + uiDiseaseTimer = urand(2000, 4000); //approx 3s + uiFrenzyTimer = urand(21000, 26000); //made it up if (pInstance) pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); @@ -97,20 +97,20 @@ public: if (uiDiseaseTimer <= diff) { DoCastAOE(SPELL_DISEASE_EXPULSION); - uiDiseaseTimer = urand(1500,4000); + uiDiseaseTimer = urand(1500, 4000); } else uiDiseaseTimer -= diff; if (uiFrenzyTimer <= diff) { DoCast(me, SPELL_FRENZY); - uiFrenzyTimer = urand(21000,26000); + uiFrenzyTimer = urand(21000, 26000); } else uiFrenzyTimer -= diff; if (uiChainTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank - uiChainTimer = urand(2000,4000); + uiChainTimer = urand(2000, 4000); } else uiChainTimer -= diff; DoMeleeAttackIfReady(); @@ -129,7 +129,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 6eb1cb66bd7..7b26df8871a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -70,7 +70,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiCurseFleshTimer; @@ -84,10 +84,10 @@ public: void Reset() { uiCurseFleshTimer = 30000; //30s DBM - uiExplodeGhoulTimer = urand(25000,28000); //approx 6 sec after summon ghouls - uiShadowBoltTimer = urand(8000,12000); // approx 10s + uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls + uiShadowBoltTimer = urand(8000, 12000); // approx 10s uiStealFleshTimer = 12345; - uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro + uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro if (pInstance) pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); @@ -119,13 +119,13 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(8000,12000); + uiShadowBoltTimer = urand(8000, 12000); } else uiShadowBoltTimer -= diff; //Steal Flesh timer if (uiStealFleshTimer <= diff) { - DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me); + DoScriptText(RAND(SAY_STEAL_FLESH_1, SAY_STEAL_FLESH_2, SAY_STEAL_FLESH_3), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_STEAL_FLESH); uiStealFleshTimer = 10000; @@ -134,7 +134,7 @@ public: //Summon ghouls timer if (uiSummonGhoulsTimer <= diff) { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me); + DoScriptText(RAND(SAY_SUMMON_GHOULS_1, SAY_SUMMON_GHOULS_2), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_SUMMON_GHOULS); uiSummonGhoulsTimer = 10000; @@ -156,7 +156,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), 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 d73373910b0..3e86a796480 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -233,7 +233,7 @@ public: bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) { pPlayer->PlayerTalkClass->ClearMenus(); - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (!pAI) return false; @@ -241,7 +241,7 @@ public: switch (action) { case GOSSIP_ACTION_INFO_DEF: - pAI->Start(true,true,pPlayer->GetGUID(),0,false,false); + pAI->Start(true, true, pPlayer->GetGUID(), 0, false, false); pAI->SetDespawnAtEnd(false); pAI->bStepping = false; pAI->uiStep = 1; @@ -275,7 +275,7 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (pAI && pAI->bStepping == false) { @@ -405,17 +405,17 @@ public: void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) { - me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000); + me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_DESPAWN, 11000); for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) { if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; - if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i-timeRiftID-1] = pTemp->GetGUID(); pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1],RiftAndSpawnsLocations[i][2],RiftAndSpawnsLocations[i][3]); + pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) uiEpochGUID = pTemp->GetGUID(); } @@ -427,7 +427,7 @@ public: for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { if ((uint32)WavesLocations[waveID][i][0] == 0) break; - if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0],WavesLocations[waveID][i][1],WavesLocations[waveID][i][2],WavesLocations[waveID][i][3],WavesLocations[waveID][i][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0], WavesLocations[waveID][i][1], WavesLocations[waveID][i][2], WavesLocations[waveID][i][3], WavesLocations[waveID][i][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i] = pTemp->GetGUID(); } @@ -464,9 +464,9 @@ public: bStepping = true; break; case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN,2091.977f,1275.021f,140.757f,0.558f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2,2093.514f,1275.842f,140.408f,3.801f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[1] = pCityman1->GetGUID(); break; case 8: @@ -477,14 +477,14 @@ public: case 12: SetRun(true); DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3,2398.14f,1207.81f,134.04f,5.155249f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); @@ -505,33 +505,33 @@ public: break; case 25: SetRun(false); - SpawnTimeRift(0,&uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307,me); + SpawnTimeRift(0, &uiInfiniteDraconianGUID[0]); + DoScriptText(SAY_PHASE307, me); break; case 29: SetRun(false); - SpawnTimeRift(5,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309,me); + SpawnTimeRift(5, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(8, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE309, me); SetHoldState(true); bStepping = true; break; case 31: SetRun(false); - SpawnTimeRift(11,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311,me); + SpawnTimeRift(11, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(14, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE311, me); SetHoldState(true); bStepping = true; break; case 32: - DoScriptText(SAY_PHASE401,me); + DoScriptText(SAY_PHASE401, me); break; case 34: - DoScriptText(SAY_PHASE402,me); + DoScriptText(SAY_PHASE402, me); break; case 35: - DoScriptText(SAY_PHASE403,me); + DoScriptText(SAY_PHASE403, me); break; case 36: if (pInstance) @@ -547,14 +547,14 @@ public: break; case 47: SetRun(false); - DoScriptText(SAY_PHASE405,me); + DoScriptText(SAY_PHASE405, me); break; case 48: SetRun(true); - DoScriptText(SAY_PHASE406,me); + DoScriptText(SAY_PHASE406, me); break; case 53: - DoScriptText(SAY_PHASE407,me); + DoScriptText(SAY_PHASE407, me); break; case 54: uiGossipStep = 5; @@ -580,7 +580,7 @@ public: case 0: if (Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f)) uiJainaGUID = pJaina->GetGUID(); - else if (Unit* pJaina = me->SummonCreature(NPC_JAINA,1895.48f,1292.66f,143.706f,0.023475f,TEMPSUMMON_DEAD_DESPAWN,180000)) + else if (Unit* pJaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000)) uiJainaGUID = pJaina->GetGUID(); bStepping = false; JumpToNextStep(0); @@ -588,7 +588,7 @@ public: //After waypoint 0 case 1: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pUther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiUtherGUID = pUther->GetGUID(); pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -677,7 +677,7 @@ public: if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) { pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pUther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -686,7 +686,7 @@ public: { me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pJaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -727,7 +727,7 @@ public: break; //After Gossip 1 (waypoint 8) case 24: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2026.469f,1287.088f,143.596f,1.37f,TEMPSUMMON_TIMED_DESPAWN,14000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2026.469f, 1287.088f, 143.596f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 14000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -752,7 +752,7 @@ public: { pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f); + pCityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); } JumpToNextStep(2000); break; @@ -796,7 +796,7 @@ public: JumpToNextStep(1000); break; case 34: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -805,7 +805,7 @@ public: JumpToNextStep(3000); break; case 35: - if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { uiStalkerGUID = pStalkerM->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -813,10 +813,10 @@ public: JumpToNextStep(1000); break; case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM,63793,false); + pMalganis->CastSpell(pStalkerM, 63793, false); uiMalganisGUID = pMalganis->GetGUID(); DoScriptText(SAY_PHASE206, pMalganis); @@ -851,7 +851,7 @@ public: JumpToNextStep(7000); break; case 40: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -921,11 +921,11 @@ public: else if (uiBossEvent == DATA_SALRAMM_EVENT) uiBossID = NPC_SALRAMM; - if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Unit* pBoss = me->SummonCreature(uiBossID, 2232.19f, 1331.933f, 126.662f, 3.15f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiBossGUID = pBoss->GetGUID(); pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f); + pBoss->GetMotionMaster()->MovePoint(0, 2194.110f, 1332.00f, 130.00f); } } JumpToNextStep(30000); @@ -985,12 +985,12 @@ public: JumpToNextStep(1000); break; case 66: - DoScriptText(SAY_PHASE304,me); + DoScriptText(SAY_PHASE304, me); JumpToNextStep(2000); break; case 67: if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305,pDisguised0); + DoScriptText(SAY_PHASE305, pDisguised0); JumpToNextStep(1000); break; case 68: @@ -1024,7 +1024,7 @@ public: JumpToNextStep(2000); break; case 71: - //After waypoint 26,29,31 + //After waypoint 26, 29, 31 case 73: case 75: case 77: @@ -1044,9 +1044,9 @@ public: uiPhaseTimer = 1000; else { - if (uiStep == 72) DoScriptText(SAY_PHASE308,me); - if (uiStep == 74) DoScriptText(SAY_PHASE308,me); - if (uiStep == 76) DoScriptText(SAY_PHASE310,me); + if (uiStep == 72) DoScriptText(SAY_PHASE308, me); + if (uiStep == 74) DoScriptText(SAY_PHASE308, me); + if (uiStep == 76) DoScriptText(SAY_PHASE310, me); SetHoldState(false); bStepping = false; SetRun(true); @@ -1058,21 +1058,21 @@ public: uiPhaseTimer = 1000; else { - DoScriptText(SAY_PHASE312,me); + DoScriptText(SAY_PHASE312, me); JumpToNextStep(5000); } break; case 79: - DoScriptText(SAY_PHASE313,me); + DoScriptText(SAY_PHASE313, me); JumpToNextStep(1000); break; case 80: if (pInstance) if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) { - SpawnTimeRift(17,&uiEpochGUID); + SpawnTimeRift(17, &uiEpochGUID); if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314,pEpoch); + DoScriptText(SAY_PHASE314, pEpoch); me->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID); } JumpToNextStep(18000); @@ -1117,14 +1117,14 @@ public: break; //After Gossip 4 case 84: - DoScriptText(SAY_PHASE404,me); + DoScriptText(SAY_PHASE404, me); SetHoldState(false); bStepping = false; break; //After Gossip 5 case 85: DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2296.665f,1502.362f,128.362f,4.961f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiMalganisGUID = pMalganis->GetGUID(); pMalganis->SetReactState(REACT_PASSIVE); @@ -1190,7 +1190,7 @@ public: if (uiExorcismTimer < diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_EXORCISM_N); uiExorcismTimer = 7300; } else uiExorcismTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 79bc8f9c1da..2e600b950ca 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -107,13 +107,13 @@ public: case GO_EXIT_GATE: uiExitGate = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(uiExitGate,true); + HandleGameObject(uiExitGate, true); break; case GO_MALGANIS_CHEST_N: case GO_MALGANIS_CHEST_H: uiMalGanisChest = go->GetGUID(); if (m_auiEncounter[3] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } } @@ -137,15 +137,15 @@ public: switch(m_auiEncounter[3]) { case NOT_STARTED: - HandleGameObject(uiMalGanisGate2,true); + HandleGameObject(uiMalGanisGate2, true); break; case IN_PROGRESS: - HandleGameObject(uiMalGanisGate2,false); + HandleGameObject(uiMalGanisGate2, false); break; case DONE: HandleGameObject(uiExitGate, true); if (GameObject* go = instance->GetGameObject(uiMalGanisChest)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 00faa87a378..438a53c16ef 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -83,7 +83,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -99,14 +99,14 @@ public: if (pInstance) { - pInstance->SetData(TYPE_RIFT,DONE); - pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed + pInstance->SetData(TYPE_RIFT, DONE); + pInstance->SetData(TYPE_MEDIVH, DONE);//FIXME: later should be removed } } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 3af197e8658..89e2fc763dd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -85,7 +85,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -97,7 +97,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -105,7 +105,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 8c9a5c5c1b9..3151a773a9b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -81,7 +81,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -89,7 +89,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void MoveInLineOfSight(Unit *who) @@ -97,7 +97,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index adc2dc2be00..f6f45069b38 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -108,7 +108,7 @@ public: return; DoScriptText(SAY_INTRO, me); - pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); + pInstance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; } @@ -121,12 +121,12 @@ public: if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT,false); + who->CastSpell(me, SPELL_CORRUPT, false); } else if (entry == C_AEONUS) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT_AEONUS,false); + who->CastSpell(me, SPELL_CORRUPT_AEONUS, false); } } } @@ -170,7 +170,7 @@ public: { if (SpellCorrupt_Timer <= diff) { - pInstance->SetData(TYPE_MEDIVH,SPECIAL); + pInstance->SetData(TYPE_MEDIVH, SPECIAL); if (me->HasAura(SPELL_CORRUPT_AEONUS)) SpellCorrupt_Timer = 1000; @@ -223,7 +223,7 @@ public: me->RemoveAura(SPELL_CHANNEL); //TODO: start the post-event here - pInstance->SetData(TYPE_MEDIVH,DONE); + pInstance->SetData(TYPE_MEDIVH, DONE); } } else Check_Timer -= diff; } @@ -313,7 +313,7 @@ public: if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) - Summon->AddThreat(temp,0.0f); + Summon->AddThreat(temp, 0.0f); } void DoSelectSummon() @@ -324,7 +324,7 @@ public: mRiftWaveCount = 0; entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).", mRiftWaveCount, entry); ++mRiftWaveCount; @@ -353,7 +353,7 @@ public: me->setDeathState(JUST_DIED); if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } }; @@ -376,7 +376,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); + pCreature->CastSpell(pPlayer, SPELL_CHRONO_BEACON, false); } return true; } @@ -386,15 +386,15 @@ public: if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); return true; } - else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); return true; } 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 24ce52c6759..6ea59e4be02 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -111,7 +111,7 @@ public: void InitWorldState(bool Enable = true) { - DoUpdateWorldState(WORLD_STATE_BM,Enable ? 1 : 0); + DoUpdateWorldState(WORLD_STATE_BM, Enable ? 1 : 0); DoUpdateWorldState(WORLD_STATE_BM_SHIELD, 100); DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } @@ -130,7 +130,7 @@ public: if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return; - pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); + pPlayer->SendUpdateWorldState(WORLD_STATE_BM, 0); } void OnCreatureCreate(Creature* creature) @@ -267,7 +267,7 @@ public: if (entry == RIFT_BOSS) entry = RandRiftBoss(); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.", entry); Position pos; me->GetRandomNearPosition(pos, 10.0f); @@ -286,18 +286,18 @@ public: { if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) { - uint8 tmp = urand(0,2); + uint8 tmp = urand(0, 2); if (tmp >= CurrentRiftId) ++tmp; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).", tmp, CurrentRiftId); CurrentRiftId = tmp; Creature* pTemp = pMedivh->SummonCreature(C_TIME_RIFT, - PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3], - TEMPSUMMON_CORPSE_DESPAWN,0); + PortalLocation[tmp][0], PortalLocation[tmp][1], PortalLocation[tmp][2], PortalLocation[tmp][3], + TEMPSUMMON_CORPSE_DESPAWN, 0); if (pTemp) { pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -306,11 +306,11 @@ public: if (Creature* pBoss = SummonedPortalBoss(pTemp)) { if (pBoss->GetEntry() == C_AEONUS) - pBoss->AddThreat(pMedivh,0.0f); + pBoss->AddThreat(pMedivh, 0.0f); else { - pBoss->AddThreat(pTemp,0.0f); - pTemp->CastSpell(pBoss,SPELL_RIFT_CHANNEL,false); + pBoss->AddThreat(pTemp, 0.0f); + pTemp->CastSpell(pBoss, SPELL_RIFT_CHANNEL, false); } } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index e402a48c59a..f2dd3e2d481 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -85,7 +85,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4fa3fafebc5..ac934c4e5f4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -76,12 +76,12 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -106,7 +106,7 @@ public: DoCast(me->getVictim(), SPELL_SAND_BREATH); - DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), me); + DoScriptText(RAND(SAY_BREATH1, SAY_BREATH2), me); SandBreath_Timer = 10000 + rand()%10000; } else SandBreath_Timer -= diff; @@ -119,7 +119,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 0243441215b..0cdbcf9fc20 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -139,7 +139,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) 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 974bd92c6cc..54382449303 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -96,7 +96,7 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* pPlayer = itr->getSource()) - pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); + pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0); } } } @@ -139,7 +139,7 @@ public: ++mBarrelCount; DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u", mBarrelCount); m_auiEncounter[0] = IN_PROGRESS; @@ -160,7 +160,7 @@ public: { ++mThrallEventCount; m_auiEncounter[1] = NOT_STARTED; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); m_auiEncounter[2] = NOT_STARTED; m_auiEncounter[3] = NOT_STARTED; m_auiEncounter[4] = NOT_STARTED; @@ -173,29 +173,29 @@ public: m_auiEncounter[3] = data; m_auiEncounter[4] = data; m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); } } else m_auiEncounter[1] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.", data); break; } case TYPE_THRALL_PART1: m_auiEncounter[2] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.", data); break; case TYPE_THRALL_PART2: m_auiEncounter[3] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.", data); break; case TYPE_THRALL_PART3: m_auiEncounter[4] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.", data); break; case TYPE_THRALL_PART4: m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.", data); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5c7f49e23df..ff296d3ce3b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -77,7 +77,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); InstanceScript* pInstance = pCreature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) + if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) @@ -208,8 +208,8 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) { - pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); - pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); @@ -229,9 +229,9 @@ public: case GOSSIP_ACTION_INFO_DEF+20: pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81f,270.26f,63.20f,5.41f,TEMPSUMMON_TIMED_DESPAWN,12000); + pCreature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); @@ -241,7 +241,7 @@ public: case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); break; } @@ -305,7 +305,7 @@ public: { case 8: SetRun(false); - me->SummonCreature(18764,2181.87f,112.46f,89.45f,0.26f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(18764, 2181.87f, 112.46f, 89.45f, 0.26f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 9: DoScriptText(SAY_TH_ARMORY, me); @@ -323,27 +323,27 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28f,137.37f,87.93f,5.07f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44f,131.83f,87.93f,0.78f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62f,135.40f,87.93f,3.70f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75f,130.13f,87.93f,1.48f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80f,154.01f,67.45f,4.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36f,151.87f,67.74f,4.46f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12f,154.41f,67.12f,4.56f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08f,155.38f,67.24f,4.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98f,192.17f,65.24f,6.02f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48f,198.75f,65.18f,5.15f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11f,197.29f,65.18f,5.63f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18f,194.82f,65.18f,5.75f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48f,271.22f,63.43f,5.27f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - //temporary,skarloc should rather be triggered to walk up to thrall + me->SummonCreature(ENTRY_SCARLOC, 2036.48f, 271.22f, 63.43f, 5.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + //temporary, skarloc should rather be triggered to walk up to thrall break; case 30: SetEscortPaused(true); @@ -357,12 +357,12 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26f,522.16f,56.87f,3.99f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69f,525.37f,57.11f,4.01f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65f,524.55f,56.63f,3.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64f,625.77f,58.26f,4.71f,TEMPSUMMON_TIMED_DESPAWN,10000); + me->SummonCreature(SKARLOC_MOUNT, 2488.64f, 625.77f, 58.26f, 4.71f, TEMPSUMMON_TIMED_DESPAWN, 10000); DoUnmount(); HadMount = false; SetRun(false); @@ -379,10 +379,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22f,692.60f,55.50f,2.84f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13f,696.55f,55.51f,3.38f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55f,693.64f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94f,695.81f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 71: SetRun(); @@ -391,10 +391,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33f,646.82f,56.03f,4.28f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14f,648.03f,56.03f,4.50f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32f,649.60f,56.03f,4.38f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22f,649.00f,56.03f,4.34f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: DoScriptText(SAY_TH_CHURCH_END, me); @@ -405,10 +405,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71f,660.31f,61.93f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96f,662.59f,61.93f,0.79f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36f,662.34f,61.93f,2.68f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39f,659.77f,61.93f,2.61f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 94: if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) @@ -419,7 +419,7 @@ public: break; case 95: DoScriptText(SAY_TH_MEET_TARETHA, me); - pInstance->SetData(TYPE_THRALL_PART3,DONE); + pInstance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: @@ -456,7 +456,7 @@ public: } //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47f,680.416f,55.38f,4.16f,TEMPSUMMON_TIMED_DESPAWN,120000); + me->SummonCreature(EROZION_ENTRY, 2646.47f, 680.416f, 55.38f, 4.16f, TEMPSUMMON_TIMED_DESPAWN, 120000); } break; case 108: @@ -483,7 +483,7 @@ public: } if (HasEscortState(STATE_ESCORT_ESCORTING)) { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1,SAY_TH_LEAVE_COMBAT2,SAY_TH_LEAVE_COMBAT3), me); + DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1, SAY_TH_LEAVE_COMBAT2, SAY_TH_LEAVE_COMBAT3), me); } } void StartWP() @@ -494,16 +494,16 @@ public: void DoMount() { me->Mount(SKARLOC_MOUNT_MODEL); - me->SetSpeed(MOVE_RUN,SPEED_MOUNT); + me->SetSpeed(MOVE_RUN, SPEED_MOUNT); } void DoUnmount() { me->Unmount(); - me->SetSpeed(MOVE_RUN,SPEED_RUN); + me->SetSpeed(MOVE_RUN, SPEED_RUN); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); + DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1, SAY_TH_RANDOM_AGGRO2, SAY_TH_RANDOM_AGGRO3, SAY_TH_RANDOM_AGGRO4), me); if (me->IsMounted()) { DoUnmount(); @@ -530,18 +530,18 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); + DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } void JustDied(Unit *slayer) { if (pInstance) - pInstance->SetData(TYPE_THRALL_EVENT,FAIL); + pInstance->SetData(TYPE_THRALL_EVENT, FAIL); // Don't do a yell if he kills self (if player goes too far or at the end). if (slayer == me) return; - DoScriptText(RAND(SAY_TH_RANDOM_DIE1,SAY_TH_RANDOM_DIE2), me); + DoScriptText(RAND(SAY_TH_RANDOM_DIE1, SAY_TH_RANDOM_DIE2), me); } void UpdateAI(const uint32 diff) @@ -554,7 +554,7 @@ public: //TODO: add his abilities'n-crap here if (!LowHp && HealthBelowPct(20)) { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1,SAY_TH_RANDOM_LOW_HP2), me); + DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1, SAY_TH_RANDOM_LOW_HP2), me); LowHp = true; } } @@ -596,9 +596,9 @@ public: if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) { - pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART4, IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13f,698.55f,65.43f,4.59f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 7bbec40784d..5ff4d8e1381 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -70,7 +70,7 @@ public: if (Wrath_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_WRATH); Wrath_Timer = 8000; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 88426f473c6..a8f088f343b 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -63,7 +63,7 @@ public: void SummonAdds(Unit* pVictim) { - if (Creature *Add = DoSpawnCreature(13456, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) + if (Creature *Add = DoSpawnCreature(13456, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Add->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 57231ba33fd..147e20fab80 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -63,7 +63,7 @@ public: void JustDied(Unit* /*killer*/) { - me->SummonCreature(12238,28.067f,61.875f,-123.405f,4.67f,TEMPSUMMON_TIMED_DESPAWN,600000); + me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } void UpdateAI(const uint32 diff) @@ -82,7 +82,7 @@ public: if (Boulder_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BOULDER); Boulder_Timer = 10000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 720e4603b1f..596d4eb8bbe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -77,14 +77,14 @@ struct sOnyxMove static sOnyxMove aMoveData[]= { - {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f},//west - {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f},//east - {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f},//north-west - {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f},//north-east - {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f},//south-east - {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f},//south-west - {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f},//south - {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f},//north + {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f}, //west + {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f}, //east + {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f}, //north-west + {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f}, //north-east + {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f}, //south-east + {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f}, //south-west + {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f}, //south + {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f}, //north }; const Position MiddleRoomLocation = {-23.6155f, -215.357f, -55.7344f, 0.0f}; @@ -200,7 +200,7 @@ public: void JustSummoned(Creature *pSummoned) { pSummoned->SetInCombatWithZone(); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); switch (pSummoned->GetEntry()) @@ -262,7 +262,7 @@ public: break; case 10: me->SetFlying(true); - me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(),Phase2Location.GetPositionY(),Phase2Location.GetPositionZ()+25); + me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25); me->SetSpeed(MOVE_FLIGHT, 1.0f); DoScriptText(SAY_PHASE_2_TRANS, me); if (m_pInstance) @@ -416,7 +416,7 @@ public: SetCombatMovement(true); me->SetFlying(false); m_bIsMoving = false; - me->GetMotionMaster()->MovePoint(9,me->GetHomePosition()); + me->GetMotionMaster()->MovePoint(9, me->GetHomePosition()); return; } @@ -478,7 +478,7 @@ public: { me->SummonCreature(NPC_WHELP, aSpawnLocations[0].GetPositionX(), aSpawnLocations[0].GetPositionY(), aSpawnLocations[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); me->SummonCreature(NPC_WHELP, aSpawnLocations[1].GetPositionX(), aSpawnLocations[1].GetPositionY(), aSpawnLocations[1].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); - if (m_uiSummonWhelpCount >= RAID_MODE(20,40)) + if (m_uiSummonWhelpCount >= RAID_MODE(20, 40)) { m_uiSummonWhelpCount = 0; m_uiWhelpTimer = 90000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index ca9f206835b..84923d3def5 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -41,7 +41,7 @@ public: //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed - std::map<uint64,uint32> FloorEruptionGUID[2]; + std::map<uint64, uint32> FloorEruptionGUID[2]; std::queue<uint64> FloorEruptionGUIDQueue; uint64 m_uiOnyxiasGUID; @@ -81,7 +81,7 @@ public: { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { - FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(),0)); + FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(), 0)); return; } @@ -90,7 +90,7 @@ public: case GO_WHELP_SPAWNER: Position goPos; go->GetPosition(&goPos); - if (Creature* pTemp = go->SummonCreature(NPC_WHELP,goPos,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pTemp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN)) { pTemp->SetInCombatWithZone(); ++m_uiManyWhelpsCounter; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 8fb2130c730..bd163b2d484 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -61,6 +61,6 @@ enum eAchievementData ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER = 12568, // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s ACHIEV_CRITERIA_DEEP_BREATH_10_PLAYER = 12566, // Criteria for achievement 4404: She Deep Breaths More (10 player) Everybody evade Deep Breath ACHIEV_CRITERIA_DEEP_BREATH_25_PLAYER = 12569, // Criteria for achievement 4407: She Deep Breaths More (25 player) Everybody evade Deep Breath - ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10,25 player) 5 min kill + ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10, 25 player) 5 min kill }; #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index e596773f875..abe8e7e8166 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -105,7 +105,7 @@ public: case GO_GONG: uiGongGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE) - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; default: break; @@ -123,7 +123,7 @@ public: case 9: case 14: if (GameObject* go = instance->GetGameObject(uiGongGUID)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 1: case 10: @@ -134,7 +134,7 @@ public: if (!go) return; - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); uint32 uiCreature = 0; uint8 uiSummonTimes = 0; @@ -156,17 +156,17 @@ public: break; } - if (Creature* creature = go->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) + if (Creature* creature = go->SummonCreature(uiCreature, 2502.635f, 844.140f, 46.896f, 0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = go->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f)) - pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + if (Creature* pSummon = go->SummonCreature(uiCreature, 2502.635f + float(irand(-5, 5)), 844.140f + float(irand(-5, 5)), 46.896f, 0.633f)) + pSummon->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } } - creature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + creature->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } break; } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index a49e12e99ca..cef5058187e 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -100,7 +100,7 @@ public: if (pInstance) { - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); return true; } @@ -137,7 +137,7 @@ public: void Reset() { - uiWebTimer = urand(5000,8000); + uiWebTimer = urand(5000, 8000); } void UpdateAI(const uint32 uiDiff) @@ -151,7 +151,7 @@ public: if (uiWebTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_WEB); - uiWebTimer = urand(7000,16000); + uiWebTimer = urand(7000, 16000); } else uiWebTimer -= uiDiff; } @@ -161,7 +161,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); } }; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index f1b21dba2ab..8fc0c83f83d 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -111,13 +111,13 @@ public: DoScriptText(SAY_FINALY, me, pPlayer); break; case 43: - me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: DoScriptText(SAY_WIN, me, pPlayer); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER,me); + CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: DoScriptText(SAY_END, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index bd916d801df..38477ab8486 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -65,11 +65,11 @@ public: void Reset() { bIsEnraged = false; - uiMortalWoundTimer = urand(2000,7000); - uiSandtrapTimer = urand(20000,30000); - uiWideSlashTimer = urand(10000,15000); - uiTrashTimer = urand(20000,25000); - uiSummonPlayerTimer = urand(30000,40000); + uiMortalWoundTimer = urand(2000, 7000); + uiSandtrapTimer = urand(20000, 30000); + uiWideSlashTimer = urand(10000, 15000); + uiTrashTimer = urand(20000, 25000); + uiSummonPlayerTimer = urand(30000, 40000); if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); @@ -103,7 +103,7 @@ public: if (uiMortalWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_MORTALWOUND); - uiMortalWoundTimer = urand(2000,7000); + uiMortalWoundTimer = urand(2000, 7000); } else uiMortalWoundTimer -= diff; //Santrap spell @@ -118,14 +118,14 @@ public: if (uiWideSlashTimer <= diff) { DoCast(me->getVictim(), SPELL_WIDE_SLASH); - uiWideSlashTimer = urand(10000,15000); + uiWideSlashTimer = urand(10000, 15000); } else uiWideSlashTimer -= diff; //Trash spell if (uiTrashTimer <= diff) { DoCast(me, SPELL_TRASH); - uiTrashTimer = urand(20000,25000); + uiTrashTimer = urand(20000, 25000); } else uiTrashTimer -= diff; //Summon Player spell @@ -133,7 +133,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SUMMON_PLAYER); - uiSummonPlayerTimer = urand(30000,40000); + uiSummonPlayerTimer = urand(30000, 40000); } else uiSummonPlayerTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index bae7f4ec8f7..37579f32a5e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -78,11 +78,11 @@ public: void Reset() { - uiTrampleTimer = urand(3000,7000); - uiDrainManaTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); + uiDrainManaTimer = urand(3000, 7000); uiPhaseTimer = 90000; Phase = NORMAL; - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); @@ -126,21 +126,21 @@ public: { DoCast(me->getVictim(), SPELL_ARCANEERUPTION); DoScriptText(EMOTE_MANA_FULL, me); - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); } //Trample Spell if (uiTrampleTimer <= diff) { DoCast(me->getVictim(), SPELL_TRAMPLE); - uiTrampleTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); } else uiTrampleTimer -= diff; //Drain Mana if (uiDrainManaTimer <= diff) { DrainMana(); - uiDrainManaTimer = urand(3000,7000); + uiDrainManaTimer = urand(3000, 7000); } else uiDrainManaTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 47c6a5e9c6d..50aeea950d8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -194,11 +194,11 @@ public: if (Charge_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { DoCast(pTarget, SPELL_CHARGE); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); AttackStart(pTarget); } @@ -210,7 +210,7 @@ public: { DoCast(me->getVictim(), SPELL_KNOCKBACK); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); KnockBack_Timer = 15000 + rand()%10000; } else KnockBack_Timer -= diff; @@ -273,8 +273,8 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); - Creature* Summoned = me->SummonCreature(15621,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); if (Summoned && pTarget) Summoned->AI()->AttackStart(pTarget); } @@ -306,7 +306,7 @@ public: Unit *pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); Unit *pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: if (pKri) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index dfaf4c5187a..801a4b078b5 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -241,7 +241,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(pTarget); } @@ -284,7 +284,7 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->InterruptNonMeleeSpells(false); DoCast(pTarget, SPELL_GREEN_BEAM); @@ -300,7 +300,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { Creature* Spawned = NULL; @@ -328,7 +328,7 @@ public: me->SetUInt64Value(UNIT_FIELD_TARGET, 0); //Select random target for dark beam to start on - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { //Face our target DarkGlareAngle = me->GetAngle(pTarget); @@ -617,12 +617,12 @@ public: for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { if (Player* pPlr = itr->getSource()) - pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER,pPlr); + pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr); } } //One random wisper every 90 - 300 seconds - WisperTimer = urand(90000,300000); + WisperTimer = urand(90000, 300000); } else WisperTimer -= diff; return; @@ -988,7 +988,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_MIND_FLAY); @@ -1064,7 +1064,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) { me->Kill(me); @@ -1281,7 +1281,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_GREEN_BEAM); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 1cb0a9631fb..8a17b7285e2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -112,19 +112,19 @@ public: //Summon 1-3 Spawns of Fankriss at random time. if (SpawnSpawns_Timer <= diff) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 1: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 2: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; } SpawnSpawns_Timer = 30000 + rand()%30000; @@ -137,7 +137,7 @@ public: if (SpawnHatchlings_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, SPELL_ROOT); @@ -145,10 +145,10 @@ public: if (DoGetThreat(pTarget)) DoModifyThreatPercent(pTarget, -100); - switch(urand(0,2)) + switch(urand(0, 2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142f,1289.2900f,-74.419533f,5.112f); + DoTeleportPlayer(pTarget, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -163,7 +163,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354f,1155.1907f,-78.849319f,2.608f); + DoTeleportPlayer(pTarget, -7990.135354f, 1155.1907f, -78.849319f, 2.608f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -178,7 +178,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget,-8159.7753f,1127.9064f,-76.868660f,0.675f); + DoTeleportPlayer(pTarget, -8159.7753f, 1127.9064f, -76.868660f, 0.675f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 0ae028e99f6..02b671083b3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -95,7 +95,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 510db661bf0..439ca675f1e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -112,7 +112,7 @@ public: if (Submerged && ChangeTarget_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 824c978e415..4c9e2f5eb7f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -106,7 +106,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -135,7 +135,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -243,7 +243,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -264,7 +264,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index f29b3b9f070..e6ad78a9d85 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -44,7 +44,7 @@ EndScriptData */ class ov_mycoordinates { public: - float x,y,z,r; + float x, y, z, r; ov_mycoordinates(float cx, float cy, float cz, float cr) { x = cx; y = cy; z = cz; r = cr; @@ -102,7 +102,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -115,7 +115,7 @@ public: { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void UpdateAI(const uint32 diff) @@ -154,18 +154,18 @@ public: if (Blink_Timer <= diff) { //DoCast(me, SPELL_BLINK); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - me->GetMap()->CreatureRelocation(me, -8340.782227f,2083.814453f,125.648788f,0.0f); + me->GetMap()->CreatureRelocation(me, -8340.782227f, 2083.814453f, 125.648788f, 0.0f); DoResetThreat(); break; case 1: - me->GetMap()->CreatureRelocation(me, -8341.546875f,2118.504639f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8341.546875f, 2118.504639f, 133.058151f, 0.0f); DoResetThreat(); break; case 2: - me->GetMap()->CreatureRelocation(me, -8318.822266f,2058.231201f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8318.822266f, 2058.231201f, 133.058151f, 0.0f); DoResetThreat(); break; } @@ -209,13 +209,13 @@ public: { DoScriptText(SAY_SPLIT, me); - ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f,2083.814453f,125.648788f,0); - ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f,2118.504639f,133.058151f,0); - ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f,2058.231201f,133.058151f,0); + ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); + ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); + ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f, 2058.231201f, 133.058151f, 0); ov_mycoordinates *bossc=place1, *i1=place2, *i2=place3; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: bossc=place1; @@ -264,7 +264,7 @@ public: case 25: Images25 = true; break; } - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature *Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) @@ -276,7 +276,7 @@ public: CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true; } - Creature *Image2 = me->SummonCreature(15263,i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); + Creature *Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image2) { Image2->SetMaxHealth(me->GetMaxHealth() / 5); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ac6dddc5f82..ceeb593d131 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -194,7 +194,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (Heal_Timer <= diff) { Unit *pOtherBoss = GetOtherBoss(); - if (pOtherBoss && pOtherBoss->IsWithinDist(me,60)) + if (pOtherBoss && pOtherBoss->IsWithinDist(me, 60)) { DoCast(pOtherBoss, SPELL_HEAL_BROTHER); Heal_Timer = 1000; @@ -311,8 +311,8 @@ struct boss_twinemperorsAI : public ScriptedAI Creature *RespawnNearbyBugsAndGetOne() { std::list<Creature*> lUnitList; - me->GetCreatureListWithEntryInGrid(lUnitList,15316,150.0f); - me->GetCreatureListWithEntryInGrid(lUnitList,15317,150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15316, 150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15317, 150.0f); if (lUnitList.empty()) return NULL; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 3d84ca41793..ade4fab62e8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -152,7 +152,7 @@ public: void AddSentinelsNear(Unit * /*nears*/) { std::list<Creature*> assistList; - me->GetCreatureListWithEntryInGrid(assistList,15264,70.0f); + me->GetCreatureListWithEntryInGrid(assistList, 15264, 70.0f); if (assistList.empty()) return; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 5c376edf629..22973967052 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y no z coordinat b/c they're all the same */ float pyramidSpawns [pyramidSpawnTotal][4] = { - {1,7789,1894.64f,1206.29f}, - {1,7787,1890.08f,1218.68f}, - {1,8876,1883.76f,1222.3f}, - {1,7789,1874.18f,1221.24f}, - {1,7787,1892.28f,1225.49f}, - {1,7788,1889.94f,1212.21f}, - {1,7787,1879.02f,1223.06f}, - {1,7789,1874.45f,1204.44f}, - {1,8876,1898.23f,1217.97f}, - {1,7787,1882.07f,1225.7f}, - {1,8877,1896.46f,1205.62f}, - {1,7787,1886.97f,1225.86f}, - {1,7787,1894.72f,1221.91f}, - {1,7787,1883.5f,1218.25f}, - {1,7787,1886.93f,1221.4f}, - {1,8876,1889.82f,1222.51f}, - {1,7788,1893.07f,1215.26f}, - {1,7788,1878.57f,1214.16f}, - {1,7788,1883.74f,1212.35f}, - {1,8877,1877,1207.27f}, - {1,8877,1873.63f,1204.65f}, - {1,8876,1877.4f,1216.41f}, - {1,8877,1899.63f,1202.52f}, - {2,7789,1902.83f,1223.41f}, - {2,8876,1889.82f,1222.51f}, - {2,7787,1883.5f,1218.25f}, - {2,7788,1883.74f,1212.35f}, - {2,8877,1877,1207.27f}, - {2,7787,1890.08f,1218.68f}, - {2,7789,1894.64f,1206.29f}, - {2,8876,1877.4f,1216.41f}, - {2,7787,1892.28f,1225.49f}, - {2,7788,1893.07f,1215.26f}, - {2,8877,1896.46f,1205.62f}, - {2,7789,1874.45f,1204.44f}, - {2,7789,1874.18f,1221.24f}, - {2,7787,1879.02f,1223.06f}, - {2,8876,1898.23f,1217.97f}, - {2,7787,1882.07f,1225.7f}, - {2,8877,1873.63f,1204.65f}, - {2,7787,1886.97f,1225.86f}, - {2,7788,1878.57f,1214.16f}, - {2,7787,1894.72f,1221.91f}, - {2,7787,1886.93f,1221.4f}, - {2,8876,1883.76f,1222.3f}, - {2,7788,1889.94f,1212.21f}, - {2,8877,1899.63f,1202.52f}, - {3,7788,1878.57f,1214.16f}, - {3,7787,1894.72f,1221.91f}, - {3,7787,1886.93f,1221.4f}, - {3,8876,1883.76f,1222.3f}, - {3,7788,1889.94f,1212.21f}, - {3,7275,1889.23f,1207.72f}, - {3,7796,1879.77f,1207.96f} + {1, 7789, 1894.64f, 1206.29f}, + {1, 7787, 1890.08f, 1218.68f}, + {1, 8876, 1883.76f, 1222.3f}, + {1, 7789, 1874.18f, 1221.24f}, + {1, 7787, 1892.28f, 1225.49f}, + {1, 7788, 1889.94f, 1212.21f}, + {1, 7787, 1879.02f, 1223.06f}, + {1, 7789, 1874.45f, 1204.44f}, + {1, 8876, 1898.23f, 1217.97f}, + {1, 7787, 1882.07f, 1225.7f}, + {1, 8877, 1896.46f, 1205.62f}, + {1, 7787, 1886.97f, 1225.86f}, + {1, 7787, 1894.72f, 1221.91f}, + {1, 7787, 1883.5f, 1218.25f}, + {1, 7787, 1886.93f, 1221.4f}, + {1, 8876, 1889.82f, 1222.51f}, + {1, 7788, 1893.07f, 1215.26f}, + {1, 7788, 1878.57f, 1214.16f}, + {1, 7788, 1883.74f, 1212.35f}, + {1, 8877, 1877, 1207.27f}, + {1, 8877, 1873.63f, 1204.65f}, + {1, 8876, 1877.4f, 1216.41f}, + {1, 8877, 1899.63f, 1202.52f}, + {2, 7789, 1902.83f, 1223.41f}, + {2, 8876, 1889.82f, 1222.51f}, + {2, 7787, 1883.5f, 1218.25f}, + {2, 7788, 1883.74f, 1212.35f}, + {2, 8877, 1877, 1207.27f}, + {2, 7787, 1890.08f, 1218.68f}, + {2, 7789, 1894.64f, 1206.29f}, + {2, 8876, 1877.4f, 1216.41f}, + {2, 7787, 1892.28f, 1225.49f}, + {2, 7788, 1893.07f, 1215.26f}, + {2, 8877, 1896.46f, 1205.62f}, + {2, 7789, 1874.45f, 1204.44f}, + {2, 7789, 1874.18f, 1221.24f}, + {2, 7787, 1879.02f, 1223.06f}, + {2, 8876, 1898.23f, 1217.97f}, + {2, 7787, 1882.07f, 1225.7f}, + {2, 8877, 1873.63f, 1204.65f}, + {2, 7787, 1886.97f, 1225.86f}, + {2, 7788, 1878.57f, 1214.16f}, + {2, 7787, 1894.72f, 1221.91f}, + {2, 7787, 1886.93f, 1221.4f}, + {2, 8876, 1883.76f, 1222.3f}, + {2, 7788, 1889.94f, 1212.21f}, + {2, 8877, 1899.63f, 1202.52f}, + {3, 7788, 1878.57f, 1214.16f}, + {3, 7787, 1894.72f, 1221.91f}, + {3, 7787, 1886.93f, 1221.4f}, + {3, 8876, 1883.76f, 1222.3f}, + {3, 7788, 1889.94f, 1212.21f}, + {3, 7275, 1889.23f, 1207.72f}, + {3, 7796, 1879.77f, 1207.96f} }; float Spawnsway[2][3] = { - {1884.86f,1228.62f,9}, - {1887.53f,1263,41} + {1884.86f, 1228.62f, 9}, + {1887.53f, 1263, 41} }; class instance_zulfarrak : public InstanceMapScript @@ -217,7 +217,7 @@ public: break; case PYRAMID_ARRIVED_AT_STAIR: SpawnPyramidWave(1); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_1); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_1); major_wave_Timer=120000; minor_wave_Timer=0; addGroupSize=2; @@ -225,7 +225,7 @@ public: case PYRAMID_WAVE_1: if (IsWaveAllDead()) { - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_2); major_wave_Timer = 10000; //give players a few seconds before wave 2 starts to rebuff } else @@ -242,7 +242,7 @@ public: { // beginning 2nd wave! SpawnPyramidWave(2); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_2); minor_wave_Timer = 0; addGroupSize=2; } @@ -253,7 +253,7 @@ public: if (IsWaveAllDead()) { SpawnPyramidWave(3); - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_3); major_wave_Timer = 5000; //give NPCs time to return to their home spots } else @@ -269,12 +269,12 @@ public: if (major_wave_Timer<diff) { // move NPCs to bottom of stair - MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f); - MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f); - MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f); - MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f); - MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); + MoveNPCIfAlive(ENTRY_BLY, 1887.92f, 1228.179f, 9.98f, 4.78f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.57f, 1228.68f, 9.69f, 4.78f); + MoveNPCIfAlive(ENTRY_ORO, 1897.23f, 1228.34f, 9.43f, 4.78f); + MoveNPCIfAlive(ENTRY_RAVEN, 1883.68f, 1227.95f, 9.543f, 4.78f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1878.02f, 1227.65f, 9.485f, 4.78f); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_3); } else major_wave_Timer -= diff; @@ -282,28 +282,28 @@ public: case PYRAMID_WAVE_3: if (IsWaveAllDead()) // move NPCS to their final positions { - SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS); - MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f); + SetData(EVENT_PYRAMID, PYRAMID_KILLED_ALL_TROLLS); + MoveNPCIfAlive(ENTRY_BLY, 1883.82f, 1200.83f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.83f, 1201.45f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_ORO, 1894.50f, 1204.40f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_RAVEN, 1874.11f, 1206.17f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1877.52f, 1199.63f, 8.87f, 1.32f); } break; }; } - std::list<uint64> addsAtBase,movedadds; + std::list<uint64> addsAtBase, movedadds; - void MoveNPCIfAlive(uint32 entry,float x,float y,float z,float o) + void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o) { if (Creature* npc = instance->GetCreature(GetData64(entry))) { if (npc->isAlive()) { npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - npc->GetMotionMaster()->MovePoint(1,x,y,z); - npc->SetHomePosition(x,y,z,o); + npc->GetMotionMaster()->MovePoint(1, x, y, z); + npc->SetHomePosition(x, y, z, o); } } } @@ -314,7 +314,7 @@ public: if (pyramidSpawns[i][0] == (float)wave) { Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0}; - TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]),pos); + TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]), pos); ts->GetMotionMaster()->MoveRandom(10); addsAtBase.push_back(ts->GetGUID()); } @@ -348,7 +348,7 @@ public: { if (Creature* add = instance->GetCreature(*addsAtBase.begin())) { - add->GetMotionMaster()->MovePath(PATH_ADDS,false); + add->GetMotionMaster()->MovePath(PATH_ADDS, false); movedadds.push_back(add->GetGUID()); } addsAtBase.erase(addsAtBase.begin()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 554c3f94499..950ed2d7fc3 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -67,7 +67,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI,pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); pCreature->AI()->DoAction(0); } return true; @@ -133,11 +133,11 @@ public: //weegli doesn't fight - he goes & blows up the door if (Creature* pWeegli = pInstance->instance->GetCreature(pInstance->GetData64(ENTRY_WEEGLI))) pWeegli->AI()->DoAction(0); - DoScriptText(SAY_1,me); + DoScriptText(SAY_1, me); Text_Timer = 5000; break; case 2: - DoScriptText(SAY_2,me); + DoScriptText(SAY_2, me); Text_Timer = 5000; break; case 3: @@ -185,7 +185,7 @@ public: Text_Timer = 0; } - void switchFactionIfAlive(InstanceScript* pInstance,uint32 entry) + void switchFactionIfAlive(InstanceScript* pInstance, uint32 entry) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) if (crew->isAlive()) @@ -199,14 +199,14 @@ public: +## go_troll_cage +######*/ -void initBlyCrewMember(InstanceScript* pInstance, uint32 entry,float x,float y, float z) +void initBlyCrewMember(InstanceScript* pInstance, uint32 entry, float x, float y, float z) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) { crew->SetReactState(REACT_AGGRESSIVE); crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - crew->SetHomePosition(x,y,z,0); - crew->GetMotionMaster()->MovePoint(1,x,y,z); + crew->SetHomePosition(x, y, z, 0); + crew->GetMotionMaster()->MovePoint(1, x, y, z); crew->setFaction(FACTION_FREED); } } @@ -222,11 +222,11 @@ public: { pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f); - initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f); + initBlyCrewMember(pInstance, ENTRY_BLY, 1884.99f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f); + initBlyCrewMember(pInstance, ENTRY_WEEGLI, 1890, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f); } return false; } @@ -319,7 +319,7 @@ public: void AttackStart(Unit *victim) { - AttackStartCaster(victim,10);//keep back & toss bombs/shoot + AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } void JustDied(Unit * /*victim*/) @@ -335,7 +335,7 @@ public: if (Bomb_Timer < diff) { - DoCast(me->getVictim(),SPELL_BOMB); + DoCast(me->getVictim(), SPELL_BOMB); Bomb_Timer = 10000; } else @@ -343,7 +343,7 @@ public: if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim())) { - DoCast(me->getVictim(),SPELL_SHOOT); + DoCast(me->getVictim(), SPELL_SHOOT); me->SetSheath(SHEATH_STATE_RANGED); } else @@ -359,9 +359,9 @@ public: { if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { - pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO,me); - me->SetHomePosition(1882.69f,1272.28f,41.87f,0); + pInstance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); + DoScriptText(SAY_WEEGLI_OHNO, me); + me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else if (destroyingDoor) @@ -383,9 +383,9 @@ public: if (me->isAlive()) { me->setFaction(FACTION_FRIENDLY); - me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f); - me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO,me); + me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); + me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted + DoScriptText(SAY_WEEGLI_OK_I_GO, me); destroyingDoor=true; } } @@ -415,7 +415,7 @@ public: // randomly summon a zombie or dead hero the first time a grave is used if (pGo->GetUseCount() == 0) { - uint32 randomchance = urand(0,100); + uint32 randomchance = urand(0, 100); if (randomchance < ZOMBIE_CHANCE) pGo->SummonCreature(ZOMBIE, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); else @@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* pPlayer,const AreaTriggerEntry * /*at*/) + bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) { Creature* pZumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 3b85f4799ce..0b4428964eb 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -85,9 +85,9 @@ class npc_torek : public CreatureScript break; case 19: //TODO: verify location and creatures amount. - me->SummonCreature(ENTRY_DURIEL,1776.73f,-2049.06f,109.83f,1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64f,-2049.41f,109.83f,1.40f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73f,-2049.50f,109.83f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 20: DoScriptText(SAY_WIN, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index e40775e9bb9..02d7852fbc7 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -138,7 +138,7 @@ public: { DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, pPlayer); - pPlayer->TalkedToCreature(me->GetEntry(),me->GetGUID()); + pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID()); } me->GetMotionMaster()->Clear(); @@ -390,7 +390,7 @@ public: case 29: DoScriptText(EMOTE_HUG, me, pPlayer); DoScriptText(SAY_END2, me, pPlayer); - pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,me); + pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } } @@ -533,7 +533,7 @@ public: if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE &&(*itr)->HasAura(SPELL_TREE_DISGUISE)) { - (*itr)->KilledMonsterCredit(MOB_SPARK,0); + (*itr)->KilledMonsterCredit(MOB_SPARK, 0); } } } @@ -541,7 +541,7 @@ public: void DespawnNagaFlag(bool despawn) { std::list<GameObject*> FlagList; - me->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 100.0f); + me->GetGameObjectListWithEntryInGrid(FlagList, GO_NAGA_FLAG, 100.0f); if (!FlagList.empty()) { @@ -592,7 +592,7 @@ public: { if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) { - ravager->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ravager->SetReactState(REACT_AGGRESSIVE); ravager->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 74fd2c27715..632dd0925ac 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -63,7 +63,7 @@ public: { uint32 spawnCreatureID = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: spawnCreatureID = 17681; @@ -72,7 +72,7 @@ public: break; case 1: case 2: - spawnCreatureID = possibleSpawns[urand(0,30)]; + spawnCreatureID = possibleSpawns[urand(0, 30)]; break; } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 81c7826c74f..454592e45dd 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -122,7 +122,7 @@ public: //ManaStorm_Timer if (ManaStorm_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index f756445462c..babc745af58 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -132,9 +132,9 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(EMOTE_KER_SLEEP_1,EMOTE_KER_SLEEP_2,EMOTE_KER_SLEEP_3), me); + DoScriptText(RAND(EMOTE_KER_SLEEP_1, EMOTE_KER_SLEEP_2, EMOTE_KER_SLEEP_3), me); - DoScriptText(RAND(SAY_KER_SLEEP_1,SAY_KER_SLEEP_2,SAY_KER_SLEEP_3,SAY_KER_SLEEP_4), me); + DoScriptText(RAND(SAY_KER_SLEEP_1, SAY_KER_SLEEP_2, SAY_KER_SLEEP_3, SAY_KER_SLEEP_4), me); me->SetStandState(UNIT_STAND_STATE_SLEEP); DoCast(me, SPELL_SLEEP_VISUAL, false); diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index a956ceacee1..a925090a16b 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -85,10 +85,10 @@ public: pCreatureTarget->GetEntry() == NPC_DYING_KODO || pCreatureTarget->GetEntry() == NPC_ANCIENT_KODO) { - pCaster->CastSpell(pCaster,SPELL_KODO_KOMBO_PLAYER_BUFF,true); + pCaster->CastSpell(pCaster, SPELL_KODO_KOMBO_PLAYER_BUFF, true); pCreatureTarget->UpdateEntry(NPC_TAMED_KODO); - pCreatureTarget->CastSpell(pCreatureTarget,SPELL_KODO_KOMBO_DESPAWN_BUFF,false); + pCreatureTarget->CastSpell(pCreatureTarget, SPELL_KODO_KOMBO_DESPAWN_BUFF, false); if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) pCreatureTarget->GetMotionMaster()->MoveIdle(); @@ -127,7 +127,7 @@ public: if (me->IsWithinDistInMap(pWho, 10.0f)) { - DoScriptText(RAND(SAY_SMEED_HOME_1,SAY_SMEED_HOME_2,SAY_SMEED_HOME_3), pWho); + DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), pWho); //spell have no implemented effect (dummy), so useful to notify spellHit DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true); @@ -179,7 +179,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) - pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(),pPlayer->GetInnPosY(),pPlayer->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); return true; } diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index ebd10679fd8..d0186840228 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -72,11 +72,11 @@ public: if (spell->Id == SPELL_AWAKEN_PEON && caster->GetTypeId() == TYPEID_PLAYER && CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE) { - caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(),me->GetGUID()); + caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); DoScriptText(SAY_SPELL_HIT, me, caster); me->RemoveAllAuras(); if (GameObject* Lumberpile = me->FindNearestGameObject(GO_LUMBERPILE, 20)) - me->GetMotionMaster()->MovePoint(1,Lumberpile->GetPositionX()-1,Lumberpile->GetPositionY(),Lumberpile->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, Lumberpile->GetPositionX()-1, Lumberpile->GetPositionY(), Lumberpile->GetPositionZ()); } } @@ -320,9 +320,9 @@ class npc_tiger_matriarch : public CreatureScript // These models was found in sniff. // TODO: generalize these models with race from dbc uint32 const trollmodel[] = -{11665,11734,11750,12037,12038,12042,12049,12849,13529,14759,15570,15701, -15702,1882,1897,1976,2025,27286,2734,2735,4084,4085,4087,4089,4231,4357, -4358,4360,4361,4362,4363,4370,4532,4537,4540,4610,6839,7037,9767,9768}; +{11665, 11734, 11750, 12037, 12038, 12042, 12049, 12849, 13529, 14759, 15570, 15701, +15702, 1882, 1897, 1976, 2025, 27286, 2734, 2735, 4084, 4085, 4087, 4089, 4231, 4357, +4358, 4360, 4361, 4362, 4363, 4370, 4532, 4537, 4540, 4610, 6839, 7037, 9767, 9768}; class npc_troll_volunteer : public CreatureScript { @@ -336,7 +336,7 @@ class npc_troll_volunteer : public CreatureScript Reset(); Player* player = me->GetOwner()->ToPlayer(); - switch (urand(1,4)) + switch (urand(1, 4)) { case 1: _mountModel = 6471; diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 189054480a1..b38e95a4f87 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -110,7 +110,7 @@ public: if (CAST_PLR(pKiller)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE) { DoCast(pKiller, SPELL_SUMMON_RESTLESS_APPARITION, true); - CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION,0); + CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION, 0); } } }; @@ -144,7 +144,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_RESTLESS_1,SAY_RESTLESS_2,SAY_RESTLESS_3), me); + DoScriptText(RAND(SAY_RESTLESS_1, SAY_RESTLESS_2, SAY_RESTLESS_3), me); } }; @@ -186,7 +186,7 @@ public: if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CLOSE_GOSSIP_MENU(); - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -507,7 +507,7 @@ public: ## npc_zelfrax ######*/ -const Position MovePosition = {-2967.030f,-3872.1799f,35.620f, 0.0f}; +const Position MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; enum eZelfrax { @@ -552,8 +552,8 @@ public: if (uiType != POINT_MOTION_TYPE) return; - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); SetCombatMovement(true); if (me->isInCombat()) @@ -564,9 +564,9 @@ public: void MoveToDock() { SetCombatMovement(false); - me->GetMotionMaster()->MovePoint(0,MovePosition); - DoScriptText(SAY_ZELFRAX,me); - DoScriptText(SAY_ZELFRAX_2,me); + me->GetMotionMaster()->MovePoint(0, MovePosition); + DoScriptText(SAY_ZELFRAX, me); + DoScriptText(SAY_ZELFRAX_2, me); } void UpdateAI(uint32 const /*uiDiff*/) diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 819b6ffe733..e7140cc1325 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -170,8 +170,8 @@ public: void EnterCombat(Unit* /*who*/) { //For an small probability the npc says something when he get aggro - if (urand(0,9) > 7) - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + if (urand(0, 9) > 7) + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 583ce6e31dc..c3706ae377f 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -366,7 +366,7 @@ public: AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); } PlayerGUID = pPlayer->GetGUID(); - Start(true,false,PlayerGUID); + Start(true, false, PlayerGUID); } return; } @@ -408,7 +408,7 @@ public: switch(Step) { case 0: - me->Say(CLINTAR_SPIRIT_SAY_START,0,PlayerGUID); + me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); Event_Timer = 8000; Step = 1; break; @@ -467,7 +467,7 @@ public: Creature *mob = me->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000); if (mob) { - mob->AddThreat(me,10000.0f); + mob->AddThreat(me, 10000.0f); mob->AI()->AttackStart(me); } Event_Timer = 2000; diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 7ae0eb6cd8f..6e1f4064413 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -160,7 +160,7 @@ public: switch(uiEventPhase) { case 1: - if (Unit* pUnit = Unit::GetUnit(*me,uiPlayerGUID)) + if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) { if (GameObject* pGo = pUnit->GetGameObject(SPELL_LUNCH)) { diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 9a9fba3aec0..1c82ad46e0e 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -96,7 +96,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE && - (pPlayer->HasItemCount(18563,1,false) || pPlayer->HasItemCount(18564,1,false))) + (pPlayer->HasItemCount(18563, 1, false) || pPlayer->HasItemCount(18564, 1, false))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(6812, pCreature->GetGUID()); @@ -287,7 +287,7 @@ npc_anachronos_the_ancient : Creature that controls the event. npc_anachronos_quest_trigger: controls the spawning of the BG War mobs. go_crystalline_tear : GameObject that begins the event and hands out quest TO DO: get correct spell IDs and timings for spells cast upon dragon transformations -TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation,but for some unknown reason it doesnt work. +TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation, but for some unknown reason it doesnt work. EndContentData */ #define QUEST_A_PAWN_ON_THE_ETERNAL_BOARD 8519 @@ -310,50 +310,50 @@ static QuestCinematic EventAnim[]= {ARYGOS_EMOTE_1, 2, 2000}, {CAELESTRASZ_SAY_1, 4, 8000}, {MERITHRA_SAY_2, 3, 6000}, - {0,3,2000}, + {0, 3, 2000}, {MERITHRA_YELL_1, 3, 2500}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1250},//fly - {0, 3, 250},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1250}, //fly + {0, 3, 250}, //remove flags {ARYGOS_SAY_1, 2, 3000}, - {0,3,2000}, + {0, 3, 2000}, {ARYGOS_YELL_1, 2, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1000},//fly - {0, 3, 1000},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1000}, //fly + {0, 3, 1000}, //remove flags {CAELESTRASZ_SAY_2, 4, 5000}, - {0,3,3000}, + {0, 3, 3000}, {CAELESTRASZ_YELL_1, 4, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 2500},// spell + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 2500}, // spell {ANACHRONOS_SAY_2, 0, 2000}, - {0, 3, 250},//fly - {0, 3, 25},//remove flags + {0, 3, 250}, //fly + {0, 3, 25}, //remove flags {FANDRAL_SAY_2, 1, 3000}, - {ANACHRONOS_SAY_3, 0, 10000},//Both run through the armies - {0,3,2000},// Sands will stop - {0,3,8000},// Summon Gate + {ANACHRONOS_SAY_3, 0, 10000}, //Both run through the armies + {0, 3, 2000}, // Sands will stop + {0, 3, 8000}, // Summon Gate {ANACHRONOS_SAY_4, 0, 4000}, - {0, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze) + {0, 0, 2000}, //spell 1-> Arcane cosmetic (Mobs freeze) {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) - {0, 0, 7000},//BarrieR - {0, 0, 4000},//Glyphs + {0, 0, 7000}, //BarrieR + {0, 0, 4000}, //Glyphs {ANACHRONOS_SAY_5, 0, 2000}, - {0, 0, 4000},// Roots - {FANDRAL_SAY_3, 1, 3000},//Root Text - {FANDRAL_EMOTE_1, 1, 3000},//falls knee + {0, 0, 4000}, // Roots + {FANDRAL_SAY_3, 1, 3000}, //Root Text + {FANDRAL_EMOTE_1, 1, 3000}, //falls knee {ANACHRONOS_SAY_6, 0, 3000}, {ANACHRONOS_SAY_7, 0, 3000}, {ANACHRONOS_SAY_8, 0, 8000}, - {ANACHRONOS_EMOTE_1, 0, 1000},//Give Scepter + {ANACHRONOS_EMOTE_1, 0, 1000}, //Give Scepter {FANDRAL_SAY_4, 1, 3000}, - {FANDRAL_SAY_5, 1, 3000},//->Equip hammer~Scepter, throw it at door - {FANDRAL_EMOTE_2, 1, 3000},//Throw hammer at door. + {FANDRAL_SAY_5, 1, 3000}, //->Equip hammer~Scepter, throw it at door + {FANDRAL_EMOTE_2, 1, 3000}, //Throw hammer at door. {ANACHRONOS_SAY_9, 0, 3000}, {FANDRAL_SAY_6, 1, 3000}, //fandral goes away {ANACHRONOS_EMOTE_2, 0, 3000}, @@ -376,76 +376,76 @@ static QuestCinematic EventAnim[]= //Cordinates for Spawns static const Position SpawnLocation[]= { - {-8085.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1424.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1422.0f, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1424.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1422.0f, 2.61f, 3.141592f}, //Kaldorei Infantry // 2 waves of warriors - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1525.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1523.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1521.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1519.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8088.0f, 1510.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8084.0f, 1520.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8088.0f, 1530.0f, 2.61f, 0.0f},//Anubisath Conqueror - - {-8080.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8082.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1531.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8081.0f, 1514.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1526.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1512.0f, 2.61f, 0.0f},//Qiraj Tank - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Tank - - {-8082.0f, 1513.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1525.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1523.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1521.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1519.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8088.0f, 1510.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8084.0f, 1520.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8088.0f, 1530.0f, 2.61f, 0.0f}, //Anubisath Conqueror + + {-8080.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8082.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1531.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8081.0f, 1514.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1526.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1512.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Tank + + {-8082.0f, 1513.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Anubisath Conqueror }; struct WaveData @@ -545,17 +545,17 @@ public: break; case 1: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - DoScriptText(FANDRAL_SAY_1, Fandral,me); + DoScriptText(FANDRAL_SAY_1, Fandral, me); break; case 2: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, 0); - DoScriptText(MERITHRA_EMOTE_1,Merithra); + DoScriptText(MERITHRA_EMOTE_1, Merithra); break; case 3: - DoScriptText(MERITHRA_SAY_1,Merithra); + DoScriptText(MERITHRA_SAY_1, Merithra); break; case 4: - DoScriptText(ARYGOS_EMOTE_1,Arygos); + DoScriptText(ARYGOS_EMOTE_1, Arygos); break; case 5: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, Fandral->GetGUID()); @@ -566,81 +566,81 @@ public: break; case 7: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, 0); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); break; case 8: - DoScriptText(MERITHRA_YELL_1,Merithra); + DoScriptText(MERITHRA_YELL_1, Merithra); break; case 9: - Merithra->CastSpell(Merithra,25105,true); + Merithra->CastSpell(Merithra, 25105, true); break; case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Merithra->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,3); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 3); break; case 11: - Merithra->CastSpell(Merithra,24818,false); + Merithra->CastSpell(Merithra, 24818, false); break; case 12: - Merithra->GetMotionMaster()->MoveCharge(-8100,1530,50,42); + Merithra->GetMotionMaster()->MoveCharge(-8100, 1530, 50, 42); break; case 13: break; case 14: - DoScriptText(ARYGOS_SAY_1,Arygos); + DoScriptText(ARYGOS_SAY_1, Arygos); Merithra->SetVisible(false); break; case 15: - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); - Merithra->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); break; case 16: DoScriptText(ARYGOS_YELL_1, Arygos); break; case 17: - Arygos->CastSpell(Arygos,25107,true); + Arygos->CastSpell(Arygos, 25107, true); break; case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Arygos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 42); break; case 19: - Arygos->CastSpell(Arygos,50505,false); + Arygos->CastSpell(Arygos, 50505, false); break; case 20: - Arygos->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Arygos->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); break; case 21: break; case 22: - DoScriptText(CAELESTRASZ_SAY_2,Caelestrasz, Fandral); + DoScriptText(CAELESTRASZ_SAY_2, Caelestrasz, Fandral); break; case 23: - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); Arygos->SetVisible(false); - Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 10); break; case 24: DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); break; case 25: - Caelestrasz->CastSpell(Caelestrasz,25106,true); + Caelestrasz->CastSpell(Caelestrasz, 25106, true); break; case 26: Caelestrasz->HandleEmoteCommand(254); Caelestrasz->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61f,4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 7.61f, 4); break; case 27: - Caelestrasz->CastSpell(Caelestrasz,54293,false); + Caelestrasz->CastSpell(Caelestrasz, 54293, false); break; case 28: - DoScriptText(ANACHRONOS_SAY_2,me, Fandral); + DoScriptText(ANACHRONOS_SAY_2, me, Fandral); break; case 29: - Caelestrasz->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Caelestrasz->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); DoScriptText(FANDRAL_SAY_2, Fandral, me); break; case 30: @@ -650,29 +650,29 @@ public: break; case 32: Caelestrasz->SetVisible(false); - Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); - Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8); - me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); + Fandral->GetMotionMaster()->MoveCharge(-8108, 1529, 2.77f, 8); + me->GetMotionMaster()->MoveCharge(-8113, 1525, 2.77f, 8); break;//both run to the gate case 33: DoScriptText(ANACHRONOS_SAY_4, me); - Caelestrasz->GetMotionMaster()->MoveCharge(-8050,1473,65,15); + Caelestrasz->GetMotionMaster()->MoveCharge(-8050, 1473, 65, 15); break; //Text: sands will stop case 34: DoCast(plr, 23017, true);//Arcane Channeling break; case 35: - me->CastSpell(-8088,1520.43f,2.67f,25158,true); + me->CastSpell(-8088, 1520.43f, 2.67f, 25158, true); break; case 36: DoCast(plr, 25159, true); break; case 37: - me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 38: DoCast(plr, 25166, true); - me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 39: DoScriptText(ANACHRONOS_SAY_5, me, Fandral); @@ -681,7 +681,7 @@ public: Fandral->CastSpell(me, 25167, true); break; case 41: - Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); DoScriptText(FANDRAL_SAY_3, Fandral); break; case 42: @@ -699,70 +699,70 @@ public: break; case 46: DoScriptText(ANACHRONOS_SAY_8, me); - me->GetMotionMaster()->MoveCharge(-8110,1527,2.77f,4); + me->GetMotionMaster()->MoveCharge(-8110, 1527, 2.77f, 4); break; case 47: DoScriptText(ANACHRONOS_EMOTE_1, me); break; case 48: - DoScriptText(FANDRAL_SAY_4,Fandral,me); + DoScriptText(FANDRAL_SAY_4, Fandral, me); break; case 49: - DoScriptText(FANDRAL_SAY_5,Fandral,me); + DoScriptText(FANDRAL_SAY_5, Fandral, me); break; case 50: - DoScriptText(FANDRAL_EMOTE_2,Fandral); - Fandral->CastSpell(-8127,1525,17.5f,33806,true); + DoScriptText(FANDRAL_EMOTE_2, Fandral); + Fandral->CastSpell(-8127, 1525, 17.5f, 33806, true); break; case 51: { uint32 entries[4] = { 15423, 15424, 15414, 15422 }; for (uint8 i = 0; i < 4; ++i) { - mob = plr->FindNearestCreature(entries[i],50,me); + mob = plr->FindNearestCreature(entries[i], 50, me); while (mob) { mob->RemoveFromWorld(); - mob = plr->FindNearestCreature(15423,50,me); + mob = plr->FindNearestCreature(15423, 50, me); } } break; } case 52: - Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f,4); - DoScriptText(ANACHRONOS_SAY_9, me,Fandral); + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f, 4); + DoScriptText(ANACHRONOS_SAY_9, me, Fandral); break; case 53: - DoScriptText(FANDRAL_SAY_6,Fandral); + DoScriptText(FANDRAL_SAY_6, Fandral); break; case 54: - DoScriptText(ANACHRONOS_EMOTE_2,me); + DoScriptText(ANACHRONOS_EMOTE_2, me); break; case 55: Fandral->SetVisible(false); break; case 56: DoScriptText(ANACHRONOS_EMOTE_3, me); - me->GetMotionMaster()->MoveCharge(-8116,1522,3.65f,4); + me->GetMotionMaster()->MoveCharge(-8116, 1522, 3.65f, 4); break; case 57: - me->GetMotionMaster()->MoveCharge(-8116.7f,1527,3.7f,4); + me->GetMotionMaster()->MoveCharge(-8116.7f, 1527, 3.7f, 4); break; case 58: - me->GetMotionMaster()->MoveCharge(-8112.67f,1529.9f,2.86f,4); + me->GetMotionMaster()->MoveCharge(-8112.67f, 1529.9f, 2.86f, 4); break; case 59: - me->GetMotionMaster()->MoveCharge(-8117.99f,1532.24f,3.94f,4); + me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); break; case 60: if (plr) - DoScriptText(ANACHRONOS_SAY_10, me,plr); - me->GetMotionMaster()->MoveCharge(-8113.46f,1524.16f,2.89f,4); + DoScriptText(ANACHRONOS_SAY_10, me, plr); + me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: - me->GetMotionMaster()->MoveCharge(-8057.1f,1470.32f,2.61f,6); - if (plr->IsInRange(me,0,15)) - plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD ,me); + me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); + if (plr->IsInRange(me, 0, 15)) + plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); break; case 62: me->SetDisplayId(15500); @@ -772,13 +772,13 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); break; case 64: - me->GetMotionMaster()->MoveCharge(-8000,1400,150,9); + me->GetMotionMaster()->MoveCharge(-8000, 1400, 150, 9); break; case 65: me->SetVisible(false); if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID))) { - DoScriptText(ARYGOS_YELL_1,me); + DoScriptText(ARYGOS_YELL_1, me); AnachronosQuestTrigger->AI()->EnterEvadeMode(); eventEnd=true; } @@ -824,7 +824,7 @@ public: uint64 MobGUID; uint64 PlayerGUID; - uint32 SpellTimer1, SpellTimer2, SpellTimer3,SpellTimer4; + uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4; bool Timers; bool hasTarget; @@ -888,23 +888,23 @@ public: if (!hasTarget) { if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) - pTarget = me->FindNearestCreature(15423,20,true); + pTarget = me->FindNearestCreature(15423, 20, true); if (me->GetEntry() == 15423) { - uint8 tar = urand(0,2); + uint8 tar = urand(0, 2); if (tar == 0) - pTarget = me->FindNearestCreature(15422,20,true); + pTarget = me->FindNearestCreature(15422, 20, true); else if (tar == 1) - pTarget = me->FindNearestCreature(15424,20,true); + pTarget = me->FindNearestCreature(15424, 20, true); else if (tar == 2) - pTarget = me->FindNearestCreature(15414,20,true); + pTarget = me->FindNearestCreature(15414, 20, true); } hasTarget = true; if (pTarget) me->AI()->AttackStart(pTarget); } - if (!(me->FindNearestCreature(15379,60))) + if (!(me->FindNearestCreature(15379, 60))) DoCast(me, 33652); if (!UpdateVictim()) @@ -1091,33 +1091,33 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535f,1535.14f,2.61f,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767f, 1533.148f,2.61f, 1.5f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52f, 1537.843f, 2.61f, 5.7f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462f, 1535.843f, 2.61f, 3.141592f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75f, 1538.795f, 2.61f, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); if (Merithra) { Merithra->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID,15420); + Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15420); Merithra->setFaction(35); } if (Caelestrasz) { Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID,15419); + Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15419); Caelestrasz->setFaction(35); } if (Arygos) { Arygos->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID,15418); + Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15418); Arygos->setFaction(35); } diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index fde36d3e590..e322baf4186 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -52,7 +52,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,6766,false); + pCreature->CastSpell(pPlayer, 6766, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 68ee527bbce..c3937ddc95e 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -80,10 +80,10 @@ public: void SendItem(Unit* receiver) { - if (CAST_PLR(receiver)->HasItemCount(11169,1,false) && - CAST_PLR(receiver)->HasItemCount(11172,11,false) && - CAST_PLR(receiver)->HasItemCount(11173,1,false) && - !CAST_PLR(receiver)->HasItemCount(11522,1,true)) + if (CAST_PLR(receiver)->HasItemCount(11169, 1, false) && + CAST_PLR(receiver)->HasItemCount(11172, 11, false) && + CAST_PLR(receiver)->HasItemCount(11173, 1, false) && + !CAST_PLR(receiver)->HasItemCount(11522, 1, true)) { ItemPosCountVec dest; uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, false); @@ -282,7 +282,7 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const *quest) { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return false; } @@ -291,7 +291,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return true; } @@ -409,7 +409,7 @@ public: { pCreature->setFaction(113); pCreature->SetFullHealth(); - pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); DoScriptText(SAY_OOX_START, pCreature); @@ -466,7 +466,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) @@ -626,8 +626,8 @@ public: { m_uiCheckSpeechTimer = 5000; - if (urand(0,9) > 8) - DoScriptText(RAND(SAY_TOOG_THIRST,SAY_TOOG_WORRIED), me); + if (urand(0, 9) > 8) + DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me); } else m_uiCheckSpeechTimer -= uiDiff; diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 0698ae4f0d5..6ede81728e6 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -446,7 +446,7 @@ public: if (!EventGrate && EventInProgress) { - float x,y,z; + float x, y, z; pWarrior->GetPosition(x, y, z); if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) { diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index f27e8e75edd..973cf0b7e1e 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -234,7 +234,7 @@ public: DoScriptText(SAY_START, pCreature, pPlayer); pCreature->setFaction(FACTION_ESCORTEE); - if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI,pCreature->AI())) + if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, pCreature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; @@ -415,7 +415,7 @@ public: { if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true)) { - panther->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); panther->SetReactState(REACT_AGGRESSIVE); panther->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index 2c202e68754..7dd6b5b21eb 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -99,7 +99,7 @@ public: if (BerserkerCharge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 0094e970e3d..35d70c64a6e 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -249,7 +249,7 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(SAY_FAINT_1,SAY_FAINT_2,SAY_FAINT_3,SAY_FAINT_4), me); + DoScriptText(RAND(SAY_FAINT_1, SAY_FAINT_2, SAY_FAINT_3, SAY_FAINT_4), me); } //what does actually happen here? Emote? Aura? @@ -263,7 +263,7 @@ public: if (HasFollowState(STATE_FOLLOW_POSTEVENT)) return; - DoScriptText(RAND(SAY_WAKE_1,SAY_WAKE_2,SAY_WAKE_3,SAY_WAKE_4), me); + DoScriptText(RAND(SAY_WAKE_1, SAY_WAKE_2, SAY_WAKE_3, SAY_WAKE_4), me); SetFollowPaused(false); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index fa9a0d77fad..4e751419303 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -212,7 +212,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN,SpawnPointGuardian[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Guardian->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Guardian); @@ -229,7 +229,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Venomancer->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Venomancer); @@ -248,7 +248,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Datter->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Datter); @@ -337,7 +337,7 @@ public: { if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 8b572323e16..0d2ef4c87be 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -76,11 +76,11 @@ public: me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); - uiAcidTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiLeechTimer = urand(3*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiPierceTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); - uiGrabTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); - uiDoorsTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiLeechTimer = urand(3*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiPierceTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); + uiDoorsTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiCheckDistanceTimer = 2*IN_MILLISECONDS; if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) @@ -118,7 +118,7 @@ public: return; float x=0.0f, y=0.0f, z=0.0f; - me->GetRespawnCoord(x,y,z); + me->GetRespawnCoord(x, y, z); if (uiCheckDistanceTimer <= uiDiff) uiCheckDistanceTimer = 5*IN_MILLISECONDS; @@ -129,7 +129,7 @@ public: } if (me->IsInEvadeMode() || !me->getVictim()) return; - if (me->GetDistance(x,y,z) > dist) + if (me->GetDistance(x, y, z) > dist) EnterEvadeMode(); } @@ -160,7 +160,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ACID_CLOUD); - uiAcidTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiAcidTimer -= diff; if (uiLeechTimer <= diff) @@ -168,7 +168,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LEECH_POISON); - uiLeechTimer = urand(11*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiLeechTimer = urand(11*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiLeechTimer -= diff; if (uiGrabTimer <= diff) @@ -176,12 +176,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. DoCast(pTarget, SPELL_WEB_GRAB); - uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiGrabTimer -= diff; if (uiDoorsTimer <= diff) { - uiDoorsTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS); + uiDoorsTimer = urand(30*IN_MILLISECONDS, 60*IN_MILLISECONDS); } else uiDoorsTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index b935cc243de..9048d2cfae8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_SUMMON_SKITTERING_SWARMER_1 = 52439, //Summon 3x 28735 H_SPELL_ACID_SPLASH = 59363, SPELL_ACID_SPLASH = 52446, - SPELL_CHARGE = 16979,//maybe is another spell + SPELL_CHARGE = 16979, //maybe is another spell SPELL_BACKSTAB = 52540, SPELL_SHADOW_BOLT = 52534, H_SPELL_SHADOW_BOLT = 59357, @@ -44,7 +44,7 @@ enum Spells SPELL_ENRAGE = 52470, SPELL_INFECTED_BITE = 52469, H_SPELL_INFECTED_BITE = 59364, - SPELL_WEB_WRAP = 52086,//the spell is not working properly + SPELL_WEB_WRAP = 52086, //the spell is not working properly SPELL_BLINDING_WEBS = 52524, H_SPELL_BLINDING_WEBS = 59365, SPELL_POSION_SPRAY = 52493, @@ -131,22 +131,22 @@ public: void Summon() { - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -212,12 +212,12 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } }; @@ -239,7 +239,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); + DoCast(me->getVictim(), SPELL_ACID_SPLASH, true); } }; @@ -277,7 +277,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoResetThreat(); - me->AddThreat(pTarget,1.0f); + me->AddThreat(pTarget, 1.0f); DoCast(pTarget, SPELL_CHARGE, true); } uiChargeTimer = 15*IN_MILLISECONDS; 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 1b9e978ac01..383689b3ec8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -89,7 +89,7 @@ public: case 192395: uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192396: uiAnubarakDoor[0] = go->GetGUID(); @@ -125,7 +125,7 @@ public: case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; if (data == DONE) - HandleGameObject(uiKrikthirDoor,true); + HandleGameObject(uiKrikthirDoor, true); break; case DATA_HADRONOX_EVENT: auiEncounter[1] = data; @@ -182,7 +182,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2; + uint16 data0, data1, data2; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 7eb49ca7763..73ab6501ffa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -65,9 +65,9 @@ public: void Reset() { - uiRootTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiBashTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiBashTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiSpawnTimer = 0; me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); @@ -110,9 +110,9 @@ public: { Position pos; victim->GetPosition(&pos); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); } } @@ -127,27 +127,27 @@ public: if (uiSpawnTimer <= diff) { SpawnAdds(); - uiSpawnTimer = urand(35*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(35*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiRootTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); - uiRootTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; if (uiBashTimer <= diff) { DoCastVictim(SPELL_BASH); - uiBashTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBashTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBashTimer -= diff; if (uiBoltTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 3cfcd8b4f97..4ab8519ac4a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -97,7 +97,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); @@ -105,12 +105,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_SLAY_3,me); //SAY_SLAY_3 on death? + DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death? if (pInstance) { @@ -147,22 +147,22 @@ public: { DoCast(me, SPELL_SUMMON_SWARMERS, true); DoCast(me, SPELL_SUMMON_SWARMERS); - if (urand(1,3) == 3) // 33% chance of dialog - DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), me); + if (urand(1, 3) == 3) // 33% chance of dialog + DoScriptText(RAND(SAY_EGG_SAC_1, SAY_EGG_SAC_2), me); uiSwarmerSpawnTimer = 10*IN_MILLISECONDS; } else uiSwarmerSpawnTimer -= diff; if (!bGuardSpawned && uiGuardSpawnTimer <= diff) { - me->MonsterTextEmote(EMOTE_HATCHES,me->GetGUID(),true); + me->MonsterTextEmote(EMOTE_HATCHES, me->GetGUID(), true); DoCast(me, SPELL_SUMMON_SWARM_GUARD); bGuardSpawned = true; } else uiGuardSpawnTimer -= diff; if (uiEnragueTimer <= diff) { - if (me->HasAura(SPELL_ENRAGE,0)) + if (me->HasAura(SPELL_ENRAGE, 0)) return; float x, y, z, o; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 48f4ed1d980..da3eff81e6e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -67,7 +67,7 @@ public: struct boss_volazjAI : public ScriptedAI { - boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature),Summons(me) + boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) { pInstance = pCreature->GetInstanceScript(); } @@ -127,12 +127,12 @@ public: if (!plr || !plr->isAlive()) continue; // Summon clone - if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); // set phase - summon->SetPhaseMask((1<<(4+insanityHandled)),true); + summon->SetPhaseMask((1<<(4+insanityHandled)), true); } } ++insanityHandled; @@ -162,7 +162,7 @@ public: } // Visible for all players in insanity - me->SetPhaseMask((1|16|32|64|128|256),true); + me->SetPhaseMask((1|16|32|64|128|256), true); // Used for Insanity handling insanityHandled = 0; @@ -309,7 +309,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; 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 5cea487eb81..68d1272750c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -94,7 +94,7 @@ public: void Reset() { - uiOpFerTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiCycloneTimer = 3*IN_MILLISECONDS; uiBoltTimer = 7*IN_MILLISECONDS; @@ -239,7 +239,7 @@ public: if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen(); bOnGround = false; - uiOpFerTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } void OpferRufen() @@ -295,7 +295,7 @@ public: if (uiCycloneTimer <= diff) { DoCast(me, SPELL_CYCLONE_STRIKE, false); - uiCycloneTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCycloneTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCycloneTimer -= diff; if (uiBoltTimer <= diff) @@ -303,7 +303,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; if (uiThunderTimer <= diff) @@ -311,7 +311,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); - uiThunderTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiThunderTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiThunderTimer -= diff; if (uiOpFerTimer <= diff) 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 053b3ff8b51..5bcddf61bbc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -22,9 +22,9 @@ enum Spells { SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, - SPELL_FLAME_SPHERE_SUMMON_1 = 55895,// 1x 30106 - H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511,// 1x 31686 - H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512,// 1x 31687 + SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 + H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 + H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512, // 1x 31687 SPELL_FLAME_SPHERE_SPAWN_EFFECT = 55891, SPELL_FLAME_SPHERE_VISUAL = 55928, SPELL_FLAME_SPHERE_PERIODIC = 55926, @@ -103,7 +103,7 @@ public: void Reset() { uiBloodthirstTimer = 10*IN_MILLISECONDS; - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); uiEmbraceTimer = 20*IN_MILLISECONDS; uiFlamesphereTimer = 5*IN_MILLISECONDS; uiEmbraceTakenDamage = 0; @@ -138,7 +138,7 @@ public: Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSphereTarget && pSpheres[0]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[0]->GetAngle(pSphereTarget); x = pSpheres[0]->GetPositionX() + DATA_SPHERE_DISTANCE * cos(angle); y = pSpheres[0]->GetPositionY() + DATA_SPHERE_DISTANCE * sin(angle); @@ -152,7 +152,7 @@ public: pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS); if (pSphereTarget && pSpheres[1] && pSpheres[2]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[1]->GetAngle(pSphereTarget) + DATA_SPHERE_ANGLE_OFFSET; x = pSpheres[1]->GetPositionX() + DATA_SPHERE_DISTANCE/2 * cos(angle); y = pSpheres[1]->GetPositionY() + DATA_SPHERE_DISTANCE/2 * sin(angle); @@ -224,7 +224,7 @@ public: //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) { - DoScriptText(RAND(SAY_VANISH_1,SAY_VANISH_2), me); + DoScriptText(RAND(SAY_VANISH_1, SAY_VANISH_2), me); DoCast(me, SPELL_VANISH); Phase = JUST_VANISHED; uiPhaseTimer = 500; @@ -232,7 +232,7 @@ public: uiEmbraceTarget = pEmbraceTarget->GetGUID(); } - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiVanishTimer -= diff; DoMeleeAttackIfReady(); @@ -278,7 +278,7 @@ public: uiPhaseTimer = 0; uiEmbraceTarget = 0; } - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } bool CheckSpheres() @@ -320,7 +320,7 @@ public: me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation()); uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); - pInstance->HandleGameObject(prison_GUID,true); + pInstance->HandleGameObject(prison_GUID, true); } }; @@ -398,8 +398,8 @@ public: 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; + case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; + case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; } CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index f693c7aad16..55346cd8197 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -112,7 +112,7 @@ public: switch(go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(0,true,go); break; + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { @@ -130,7 +130,7 @@ public: else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; } } @@ -167,7 +167,7 @@ public: } if (vInitiands.empty()) return 0; - uint8 j = urand(0,vInitiands.size() -1); + uint8 j = urand(0, vInitiands.size() -1); return vInitiands[j]; } case DATA_ADD_JEDOGA_OPFER: return JedogaSacrifices; @@ -183,7 +183,7 @@ public: case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: if (data == DONE) - HandleGameObject(Prince_TaldaramGate,true); + HandleGameObject(Prince_TaldaramGate, true); m_auiEncounter[1] = data; break; case DATA_JEDOGA_SHADOWSEEKER_EVENT: 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 72fe60846b8..d21b57298cf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -104,7 +104,7 @@ public: { pInstance = pCreature->GetInstanceScript(); pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } InstanceScript* pInstance; @@ -152,7 +152,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -176,7 +176,7 @@ public: if (uiVenganceTimer <= uiDiff) { - DoCast(me,SPELL_VENGEANCE); + DoCast(me, SPELL_VENGEANCE); uiVenganceTimer = 10000; } else uiVenganceTimer -= uiDiff; @@ -211,7 +211,7 @@ public: MemoryGUID = 0; pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pCreature->RestoreFaction(); } @@ -232,9 +232,9 @@ public: { me->RemoveAllAuras(); - uiHolyFireTimer = urand(9000,12000); - uiHolySmiteTimer = urand(5000,7000); - uiRenewTimer = urand(2000,5000); + uiHolyFireTimer = urand(9000, 12000); + uiHolySmiteTimer = urand(5000, 7000); + uiRenewTimer = urand(2000, 5000); uiResetTimer = 7000; @@ -278,7 +278,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -290,12 +290,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_HOLY_FIRE); + DoCast(pTarget, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) uiHolyFireTimer = 13000; else - uiHolyFireTimer = urand(9000,12000); + uiHolyFireTimer = urand(9000, 12000); } else uiHolyFireTimer -= uiDiff; if (uiHolySmiteTimer <= uiDiff) @@ -303,12 +303,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SMITE); + DoCast(pTarget, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) uiHolySmiteTimer = 9000; else - uiHolySmiteTimer = urand(5000,7000); + uiHolySmiteTimer = urand(5000, 7000); } else uiHolySmiteTimer -= uiDiff; if (me->HasAura(SPELL_SHIELD)) @@ -316,11 +316,11 @@ public: if (uiRenewTimer <= uiDiff) { me->InterruptNonMeleeSpells(true); - uint8 uiTarget = urand(0,1); + uint8 uiTarget = urand(0, 1); switch(uiTarget) { case 0: - DoCast(me,SPELL_RENEW); + DoCast(me, SPELL_RENEW); break; case 1: if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) @@ -328,17 +328,17 @@ public: DoCast(pMemory, SPELL_RENEW); break; } - uiRenewTimer = urand(15000,17000); + uiRenewTimer = urand(15000, 17000); } else uiRenewTimer -= uiDiff; } if (!bHealth && !HealthAbovePct(25)) { me->InterruptNonMeleeSpells(true); - DoCastAOE(SPELL_HOLY_NOVA,false); + DoCastAOE(SPELL_HOLY_NOVA, false); DoCast(me, SPELL_SHIELD); - DoCastAOE(SPELL_SUMMON_MEMORY,false); - DoCastAOE(SPELL_CONFESS,false); + DoCastAOE(SPELL_SUMMON_MEMORY, false); + DoCastAOE(SPELL_CONFESS, false); bHealth = true; } @@ -385,7 +385,7 @@ public: if (uiOldWoundsTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_OLD_WOUNDS); @@ -401,10 +401,10 @@ public: if (uiShadowPastTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SHADOWS_PAST); + DoCast(pTarget, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; }else uiShadowPastTimer -= uiDiff; @@ -419,7 +419,7 @@ public: if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) { if (pSummoner && pSummoner->isAlive()) - CAST_CRE(pSummoner)->AI()->SetData(1,0); + CAST_CRE(pSummoner)->AI()->SetData(1, 0); } } } @@ -480,13 +480,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,712.14f,628.42f,411.88f); + AddWaypoint(0, 712.14f, 628.42f, 411.88f); break; case 1: - AddWaypoint(0,742.44f,650.29f,411.79f); + AddWaypoint(0, 742.44f, 650.29f, 411.79f); break; case 2: - AddWaypoint(0,783.33f,615.29f,411.84f); + AddWaypoint(0, 783.33f, 615.29f, 411.84f); break; } break; @@ -494,13 +494,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,713.12f,632.97f,411.90f); + AddWaypoint(0, 713.12f, 632.97f, 411.90f); break; case 1: - AddWaypoint(0,746.73f,650.24f,411.56f); + AddWaypoint(0, 746.73f, 650.24f, 411.56f); break; case 2: - AddWaypoint(0,781.32f,610.54f,411.82f); + AddWaypoint(0, 781.32f, 610.54f, 411.82f); break; } break; @@ -508,19 +508,19 @@ public: switch(uiType) { case 0: - AddWaypoint(0,715.06f,637.07f,411.91f); + AddWaypoint(0, 715.06f, 637.07f, 411.91f); break; case 1: - AddWaypoint(0,750.72f,650.20f,411.77f); + AddWaypoint(0, 750.72f, 650.20f, 411.77f); break; case 2: - AddWaypoint(0,779.77f,607.03f,411.81f); + AddWaypoint(0, 779.77f, 607.03f, 411.81f); break; } break; } - Start(false,true,0); + Start(false, true, 0); uiWaypoint = uiType; } @@ -537,7 +537,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); + pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; 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 223fda6cde2..5157a602a21 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -118,16 +118,16 @@ public: uiPhase = PHASE_UNDEAD; - uiIcyTouchTimer = urand(5000,9000); - uiPlagueStrikeTimer = urand(10000,13000); - uiDeathRespiteTimer = urand(15000,16000); - uiObliterateTimer = urand(17000,19000); - uiDesecration = urand(15000,16000); + uiIcyTouchTimer = urand(5000, 9000); + uiPlagueStrikeTimer = urand(10000, 13000); + uiDeathRespiteTimer = urand(15000, 16000); + uiObliterateTimer = urand(17000, 19000); + uiDesecration = urand(15000, 16000); uiDeathArmyCheckTimer = 7000; uiResurrectTimer = 4000; uiGhoulExplodeTimer = 8000; - uiDeathBiteTimer = urand (2000,4000); - uiMarkedDeathTimer = urand (5000,7000); + uiDeathBiteTimer = urand (2000, 4000); + uiMarkedDeathTimer = urand (5000, 7000); } void RemoveSummons() @@ -161,7 +161,7 @@ public: if (uiResurrectTimer <= uiDiff) { me->SetFullHealth(); - DoCast(me,SPELL_BLACK_KNIGHT_RES,true); + DoCast(me, SPELL_BLACK_KNIGHT_RES, true); uiPhase++; uiResurrectTimer = 4000; bEventInProgress = false; @@ -177,17 +177,17 @@ public: if (uiIcyTouchTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiIcyTouchTimer = urand(5000,7000); + uiIcyTouchTimer = urand(5000, 7000); } else uiIcyTouchTimer -= uiDiff; if (uiPlagueStrikeTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiPlagueStrikeTimer = urand(12000,15000); + uiPlagueStrikeTimer = urand(12000, 15000); } else uiPlagueStrikeTimer -= uiDiff; if (uiObliterateTimer <= uiDiff) { DoCastVictim(SPELL_OBLITERATE); - uiObliterateTimer = urand(17000,19000); + uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; switch(uiPhase) { @@ -198,9 +198,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DEATH_RESPITE); + DoCast(pTarget, SPELL_DEATH_RESPITE); } - uiDeathRespiteTimer = urand(15000,16000); + uiDeathRespiteTimer = urand(15000, 16000); } else uiDeathRespiteTimer -= uiDiff; break; } @@ -226,9 +226,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DESECRATION); + DoCast(pTarget, SPELL_DESECRATION); } - uiDesecration = urand(15000,16000); + uiDesecration = urand(15000, 16000); } else uiDesecration -= uiDiff; if (uiGhoulExplodeTimer <= uiDiff) { @@ -253,7 +253,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_MARKED_DEATH); + DoCast(pTarget, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); } else uiMarkedDeathTimer -= uiDiff; @@ -289,7 +289,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); + pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); } }; @@ -349,7 +349,7 @@ public: { npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 /*i*/) 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 d5254a0b706..e1e92b1cdd9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -81,14 +81,14 @@ enum eSeat /* struct Point { - float x,y,z; + float x, y, z; }; const Point MovementPoint[] = { - {746.84f,623.15f,411.41f}, - {747.96f,620.29f,411.09f}, - {750.23f,618.35f,411.09f} + {746.84f, 623.15f, 411.41f}, + {747.96f, 620.29f, 411.09f}, + {750.23f, 618.35f, 411.09f} }; */ void AggroAllPlayers(Creature* pTemp) @@ -107,7 +107,7 @@ void AggroAllPlayers(Creature* pTemp) if (pPlayer->isAlive()) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -171,7 +171,7 @@ public: { uiChargeTimer = 5000; uiShieldBreakerTimer = 8000; - uiBuffTimer = urand(30000,60000); + uiBuffTimer = urand(30000, 60000); } void SetData(uint32 uiType, uint32 /*uiData*/) @@ -179,28 +179,28 @@ public: switch(uiType) { case 1: - AddWaypoint(0,747.36f,634.07f,411.572f); - AddWaypoint(1,780.43f,607.15f,411.82f); - AddWaypoint(2,785.99f,599.41f,411.92f); - AddWaypoint(3,778.44f,601.64f,411.79f); + AddWaypoint(0, 747.36f, 634.07f, 411.572f); + AddWaypoint(1, 780.43f, 607.15f, 411.82f); + AddWaypoint(2, 785.99f, 599.41f, 411.92f); + AddWaypoint(3, 778.44f, 601.64f, 411.79f); uiWaypointPath = 1; break; case 2: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,768.72f,581.01f,411.92f); - AddWaypoint(2,763.55f,590.52f,411.71f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 768.72f, 581.01f, 411.92f); + AddWaypoint(2, 763.55f, 590.52f, 411.71f); uiWaypointPath = 2; break; case 3: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,784.02f,645.33f,412.39f); - AddWaypoint(2,775.67f,641.91f,411.91f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 784.02f, 645.33f, 412.39f); + AddWaypoint(2, 775.67f, 641.91f, 411.91f); uiWaypointPath = 3; break; } if (uiType <= 3) - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 i) @@ -226,7 +226,7 @@ public: void DoCastSpellShield() { for (uint8 i = 0; i < 3; ++i) - DoCast(me,SPELL_SHIELD,true); + DoCast(me, SPELL_SHIELD, true); } void UpdateAI(const uint32 uiDiff) @@ -241,7 +241,7 @@ public: if (!me->HasAura(SPELL_SHIELD)) DoCastSpellShield(); - uiBuffTimer = urand(30000,45000); + uiBuffTimer = urand(30000, 45000); }else uiBuffTimer -= uiDiff; if (uiChargeTimer <= uiDiff) @@ -252,10 +252,10 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,1.0f); + me->AddThreat(pPlayer, 1.0f); DoCast(pPlayer, SPELL_CHARGE); break; } @@ -279,9 +279,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,10.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 10.0f, 30.0f, false)) { - pPassenger->CastSpell(pPlayer,SPELL_SHIELD_BREAKER,true); + pPassenger->CastSpell(pPlayer, SPELL_SHIELD_BREAKER, true); break; } } @@ -320,7 +320,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -338,9 +338,9 @@ public: void Reset() { - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); uiInterceptTimer = 7000; - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } void JustReachedHome() @@ -363,11 +363,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); EnterEvadeMode(); bHome = true; @@ -393,11 +393,11 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,5.0f); - DoCast(pPlayer,SPELL_INTERCEPT); + me->AddThreat(pPlayer, 5.0f); + DoCast(pPlayer, SPELL_INTERCEPT); break; } } @@ -408,13 +408,13 @@ public: if (uiBladeStormTimer <= uiDiff) { DoCastVictim(SPELL_BLADESTORM); - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); } else uiBladeStormTimer -= uiDiff; if (uiMortalStrikeTimer <= uiDiff) { DoCastVictim(SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } else uiMortalStrikeTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -453,7 +453,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -497,11 +497,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -537,14 +537,14 @@ public: if (uiPolymorphTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; if (uiBlastWaveTimer <= uiDiff) { - DoCastAOE(SPELL_BLAST_WAVE,false); + DoCastAOE(SPELL_BLAST_WAVE, false); uiBlastWaveTimer = 13000; } else uiBlastWaveTimer -= uiDiff; @@ -552,7 +552,7 @@ public: { me->InterruptNonMeleeSpells(true); - DoCast(me,SPELL_HASTE); + DoCast(me, SPELL_HASTE); uiHasteTimer = 22000; } else uiHasteTimer -= uiDiff; @@ -592,7 +592,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -612,14 +612,14 @@ public: { uiChainLightningTimer = 16000; uiHealingWaveTimer = 12000; - uiEartShieldTimer = urand(30000,35000); - uiHexMendingTimer = urand(20000,25000); + uiEartShieldTimer = urand(30000, 35000); + uiHexMendingTimer = urand(20000, 25000); } void EnterCombat(Unit* pWho) { - DoCast(me,SPELL_EARTH_SHIELD); - DoCast(pWho,SPELL_HEX_OF_MENDING); + DoCast(me, SPELL_EARTH_SHIELD); + DoCast(pWho, SPELL_HEX_OF_MENDING); }; void JustReachedHome() @@ -642,11 +642,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -669,38 +669,38 @@ public: if (uiChainLightningTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; } else uiChainLightningTimer -= uiDiff; if (uiHealingWaveTimer <= uiDiff) { - bool bChance = urand(0,1); + bool bChance = urand(0, 1); if (!bChance) { if (Unit* pFriend = DoSelectLowestHpFriendly(40)) - DoCast(pFriend,SPELL_HEALING_WAVE); + DoCast(pFriend, SPELL_HEALING_WAVE); } else - DoCast(me,SPELL_HEALING_WAVE); + DoCast(me, SPELL_HEALING_WAVE); uiHealingWaveTimer = 12000; } else uiHealingWaveTimer -= uiDiff; if (uiEartShieldTimer <= uiDiff) { - DoCast(me,SPELL_EARTH_SHIELD); + DoCast(me, SPELL_EARTH_SHIELD); - uiEartShieldTimer = urand(30000,35000); + uiEartShieldTimer = urand(30000, 35000); } else uiEartShieldTimer -= uiDiff; if (uiHexMendingTimer <= uiDiff) { - DoCastVictim(SPELL_HEX_OF_MENDING,true); + DoCastVictim(SPELL_HEX_OF_MENDING, true); - uiHexMendingTimer = urand(20000,25000); + uiHexMendingTimer = urand(20000, 25000); } else uiHexMendingTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -739,7 +739,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -788,11 +788,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -815,13 +815,13 @@ public: if (uiLightningArrowsTimer <= uiDiff) { - DoCastAOE(SPELL_LIGHTNING_ARROWS,false); + DoCastAOE(SPELL_LIGHTNING_ARROWS, false); uiLightningArrowsTimer = 7000; } else uiLightningArrowsTimer -= uiDiff; if (uiShootTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f)) { uiTargetGUID = pTarget->GetGUID(); DoCast(pTarget, SPELL_SHOOT); @@ -836,9 +836,9 @@ public: me->InterruptNonMeleeSpells(true); Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); - if (pTarget && me->IsInRange(pTarget,5.0f,30.0f,false)) + if (pTarget && me->IsInRange(pTarget, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); } else { Map::PlayerList const& players = me->GetMap()->GetPlayers(); @@ -847,9 +847,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,5.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); break; } } @@ -894,7 +894,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -935,11 +935,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -962,20 +962,20 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_EVISCERATE); + DoCast(me->getVictim(), SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; if (uiFanKivesTimer <= uiDiff) { - DoCastAOE(SPELL_FAN_OF_KNIVES,false); + DoCastAOE(SPELL_FAN_OF_KNIVES, false); uiFanKivesTimer = 14000; } else uiFanKivesTimer -= uiDiff; if (uiPosionBottleTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_POISON_BOTTLE); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_POISON_BOTTLE); uiPosionBottleTimer = 19000; } else uiPosionBottleTimer -= uiDiff; 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 8ed67493825..29f5fcbfffd 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 @@ -136,7 +136,7 @@ public: case NPC_JAEREN: uiAnnouncerGUID = creature->GetGUID(); if (TeamInInstance == ALLIANCE) - creature->UpdateEntry(NPC_ARELAS,ALLIANCE); + creature->UpdateEntry(NPC_ARELAS, ALLIANCE); break; case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_BATTLEWORG: @@ -172,7 +172,7 @@ public: if (uiMovementDone == 3) { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - pAnnouncer->AI()->SetData(DATA_IN_POSITION,0); + pAnnouncer->AI()->SetData(DATA_IN_POSITION, 0); } break; case BOSS_GRAND_CHAMPIONS: @@ -189,9 +189,9 @@ public: { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } } } @@ -202,8 +202,8 @@ public: { if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) { - pBoss->GetMotionMaster()->MovePoint(0,746.88f,618.74f,411.06f); - pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pBoss->GetMotionMaster()->MovePoint(0, 746.88f, 618.74f, 411.06f); + pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pBoss->SetReactState(REACT_AGGRESSIVE); } } @@ -212,18 +212,18 @@ public: m_auiEncounter[1] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; case BOSS_ARGENT_CHALLENGE_P: m_auiEncounter[2] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; } 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 bf4d8f2ef4f..44dd6efe712 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 @@ -39,7 +39,7 @@ EndContentData */ ## npc_announcer_toc5 ######*/ -const Position SpawnPosition = {746.261f,657.401f,411.681f,4.65f}; +const Position SpawnPosition = {746.261f, 657.401f, 411.681f, 4.65f}; class npc_announcer_toc5 : public CreatureScript { @@ -74,7 +74,7 @@ public: Champion3List.clear(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetGrandChampionsForEncounter(); @@ -106,7 +106,7 @@ public: std::list<uint64> Champion2List; std::list<uint64> Champion3List; - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + void NextStep(uint32 uiTimerStep, bool bNextStep = true, uint8 uiPhaseStep = 0) { uiTimer = uiTimerStep; if (bNextStep) @@ -121,13 +121,13 @@ public: { case DATA_START: DoSummonGrandChampion(uiFirstBoss); - NextStep(10000,false,1); + NextStep(10000, false, 1); break; case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) - pInstance->HandleGameObject(pGO->GetGUID(),false); - NextStep(10000,false,3); + pInstance->HandleGameObject(pGO->GetGUID(), false); + NextStep(10000, false, 3); break; case DATA_LESSER_CHAMPIONS_DEFEATED: { @@ -213,7 +213,7 @@ public: return; } - if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1,SpawnPosition)) + if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { switch(uiSummonTimes) { @@ -227,10 +227,10 @@ public: uiGrandChampionBoss1 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1,uiVehicle1GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_1,uiGrandChampionBoss1); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1); } - pBoss->AI()->SetData(1,0); + pBoss->AI()->SetData(1, 0); break; } case 2: @@ -243,10 +243,10 @@ public: uiGrandChampionBoss2 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2,uiVehicle2GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_2,uiGrandChampionBoss2); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2); } - pBoss->AI()->SetData(2,0); + pBoss->AI()->SetData(2, 0); break; } case 3: @@ -259,10 +259,10 @@ public: uiGrandChampionBoss3 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3,uiVehicle3GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_3,uiGrandChampionBoss3); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3); } - pBoss->AI()->SetData(3,0); + pBoss->AI()->SetData(3, 0); break; } default: @@ -271,7 +271,7 @@ public: for (uint8 i = 0; i < 3; ++i) { - if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2,SpawnPosition,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { switch(uiSummonTimes) { @@ -289,13 +289,13 @@ public: switch(i) { case 0: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); break; case 1: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2); break; case 2: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2 + M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2 + M_PI); break; } } @@ -306,36 +306,36 @@ public: void DoStartArgentChampionEncounter() { - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); - if (me->SummonCreature(uiArgentChampion,SpawnPosition)) + if (me->SummonCreature(uiArgentChampion, SpawnPosition)) { for (uint8 i = 0; i < 3; ++i) { - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS,SpawnPosition)) - pTrash->AI()->SetData(i,0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS, SpawnPosition)) + pTrash->AI()->SetData(i, 0); } } } void SetGrandChampionsForEncounter() { - uiFirstBoss = urand(0,4); + uiFirstBoss = urand(0, 4); while (uiSecondBoss == uiFirstBoss || uiThirdBoss == uiFirstBoss || uiThirdBoss == uiSecondBoss) { - uiSecondBoss = urand(0,4); - uiThirdBoss = urand(0,4); + uiSecondBoss = urand(0, 4); + uiThirdBoss = urand(0, 4); } } void SetArgentChampion() { - uint8 uiTempBoss = urand(0,1); + uint8 uiTempBoss = urand(0, 1); switch(uiTempBoss) { @@ -360,7 +360,7 @@ public: if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) { if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) - me->AI()->SetData(DATA_START,0); + me->AI()->SetData(DATA_START, 0); if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) DoStartArgentChampionEncounter(); @@ -369,7 +369,7 @@ public: if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0); + me->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0); } } @@ -389,8 +389,8 @@ public: if (pPlayer->isAlive()) { - pTemp->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -410,11 +410,11 @@ public: { case 1: DoSummonGrandChampion(uiSecondBoss); - NextStep(10000,true); + NextStep(10000, true); break; case 2: DoSummonGrandChampion(uiThirdBoss); - NextStep(0,false); + NextStep(0, false); break; case 3: if (!Champion1List.empty()) @@ -422,7 +422,7 @@ public: for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*me, *itr)) AggroAllPlayers(pSummon); - NextStep(0,false); + NextStep(0, false); } break; } @@ -436,7 +436,7 @@ public: { if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { - pSummon->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pSummon->SetReactState(REACT_PASSIVE); } } @@ -455,7 +455,7 @@ public: case VEHICLE_ORGRIMMAR_WOLF: case VEHICLE_SILVERMOON_HAWKSTRIDER: case VEHICLE_DARKSPEAR_RAPTOR: - me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED,0); + me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED, 0); break; } } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 26ab0cc31c7..55d93f6997d 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -71,22 +71,22 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,NOT_STARTED); + pInstance->SetData(DATA_DRED_EVENT, NOT_STARTED); pInstance->SetData(DATA_KING_DRED_ACHIEV, 0); } uiBellowingRoarTimer = 33*IN_MILLISECONDS; uiGrievousBiteTimer = 20*IN_MILLISECONDS; uiManglingSlashTimer = 18500; - uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiPiercingSlashTimer = 17*IN_MILLISECONDS; - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } void EnterCombat(Unit* /*who*/) { if (pInstance) - pInstance->SetData(DATA_DRED_EVENT,IN_PROGRESS); + pInstance->SetData(DATA_DRED_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -103,38 +103,38 @@ public: if (uiGrievousBiteTimer < diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE ,false); + DoCastVictim(SPELL_GRIEVOUS_BITE , false); uiGrievousBiteTimer = 20*IN_MILLISECONDS; } else uiGrievousBiteTimer -=diff; if (uiManglingSlashTimer < diff) { - DoCastVictim(SPELL_MANGLING_SLASH,false); + DoCastVictim(SPELL_MANGLING_SLASH, false); uiManglingSlashTimer = 20*IN_MILLISECONDS; } else uiManglingSlashTimer -=diff; if (uiFearsomeRoarTimer < diff) { - DoCastAOE(SPELL_FEARSOME_ROAR,false); - uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS,18*IN_MILLISECONDS); + DoCastAOE(SPELL_FEARSOME_ROAR, false); + uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiFearsomeRoarTimer -=diff; if (uiPiercingSlashTimer < diff) { - DoCastVictim(SPELL_PIERCING_SLASH,false); + DoCastVictim(SPELL_PIERCING_SLASH, false); uiPiercingSlashTimer = 20*IN_MILLISECONDS; } else uiPiercingSlashTimer -=diff; if (uiRaptorCallTimer < diff) { - DoCastVictim(SPELL_RAPTOR_CALL,false); + DoCastVictim(SPELL_RAPTOR_CALL, false); - float x,y,z; + float x, y, z; - me->GetClosePoint(x,y,z,me->GetObjectSize()/3,10.0f); - me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILLISECONDS); + me->GetClosePoint(x, y, z, me->GetObjectSize()/3, 10.0f); + me->SummonCreature(RAND(NPC_RAPTOR_1, NPC_RAPTOR_2), x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 1*IN_MILLISECONDS); - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiRaptorCallTimer -=diff; DoMeleeAttackIfReady(); @@ -144,7 +144,7 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,DONE); + pInstance->SetData(DATA_DRED_EVENT, DONE); if (IsHeroic() && pInstance->GetData(DATA_KING_DRED_ACHIEV) == 6) pInstance->DoCompleteAchievement(ACHIEV_BETTER_OFF_DRED); @@ -176,7 +176,7 @@ public: void Reset() { - GutRipTimer = urand(10000,15000); + GutRipTimer = urand(10000, 15000); } void UpdateAI(const uint32 diff) @@ -187,8 +187,8 @@ public: if (GutRipTimer < diff) { - DoCastVictim(SPELL_GUT_RIP,false); - GutRipTimer = urand(10000,15000); + DoCastVictim(SPELL_GUT_RIP, false); + GutRipTimer = urand(10000, 15000); }else GutRipTimer -=diff; DoMeleeAttackIfReady(); @@ -230,7 +230,7 @@ public: void Reset() { - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -241,8 +241,8 @@ public: if (uiRendTimer < diff) { - DoCastVictim(SPELL_REND,false); - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + DoCastVictim(SPELL_REND, false); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); }else uiRendTimer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 87b4a080cb8..45ce90ffa4a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -148,7 +148,7 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); @@ -159,9 +159,9 @@ public: if (uiCrystalHandlerTimer <= diff) { DoScriptText(SAY_NECRO_ADD, me); - Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); - uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCrystalHandlerTimer -= diff; } break; @@ -169,9 +169,9 @@ public: if (uiTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST,SPELL_BLIZZARD,SPELL_FROSTBOLT,SPELL_WRATH_OF_MISERY), - RAND(H_SPELL_ARCANE_BLAST,H_SPELL_BLIZZARD,H_SPELL_FROSTBOLT,H_SPELL_WRATH_OF_MISERY))); - uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); + DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), + RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); + uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); } else uiTimer -= diff; break; default: @@ -268,7 +268,7 @@ public: void JustDied(Unit* /*killer*/) { if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) - CAST_AI(boss_novos::boss_novosAI,pNovos->AI())->RemoveCrystal(); + CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->RemoveCrystal(); } void UpdateAI(const uint32 diff) @@ -278,7 +278,7 @@ public: if (uiFlashOfDarknessTimer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS,H_SPELL_FLASH_OF_DARKNESS)); + DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS, H_SPELL_FLASH_OF_DARKNESS)); uiFlashOfDarknessTimer = 5*IN_MILLISECONDS; } else uiFlashOfDarknessTimer -= diff; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 11ebbb6199b..0f3725dce21 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -92,8 +92,8 @@ public: { uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); Phase = SKELETAL; me->SetDisplayId(me->GetNativeDisplayId()); if (pInstance) @@ -121,19 +121,19 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSE_OF_LIFE); - uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCurseOfLifeTimer -= diff; if (uiShadowVolleyTimer < diff) { DoCastVictim(SPELL_SHADOW_VOLLEY); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else uiShadowVolleyTimer -= diff; if (uiRainOfFireTimer < diff) { DoCastAOE(SPELL_RAIN_OF_FIRE); - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiRainOfFireTimer -= diff; if (uiPhaseTimer < diff) @@ -148,7 +148,7 @@ public: case GOING_FLESH: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_FLESH_1,SAY_FLESH_2),me); + DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); me->SetDisplayId(MODEL_FLESH); std::list<Unit *> playerList; @@ -156,13 +156,13 @@ public: for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { Unit *pTemp = (*itr); - me->AddAura(SPELL_GIFT_OF_THARON_JA,pTemp); + me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); pTemp->SetDisplayId(MODEL_SKELETON); } uiPhaseTimer = 20*IN_MILLISECONDS; - uiLightningBreathTimer = urand(3*IN_MILLISECONDS,4*IN_MILLISECONDS); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,8*IN_MILLISECONDS); - uiPoisonCloudTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(3*IN_MILLISECONDS, 4*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 8*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); Phase = FLESH; } else uiPhaseTimer -= diff; break; @@ -171,20 +171,20 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BREATH); - uiLightningBreathTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_EYE_BEAM); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,6*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 6*IN_MILLISECONDS); } else uiEyeBeamTimer -= diff; if (uiPoisonCloudTimer < diff) { DoCastAOE(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(10*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(10*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiPoisonCloudTimer -= diff; if (uiPhaseTimer < diff) @@ -198,13 +198,13 @@ public: case GOING_SKELETAL: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_SKELETON_1,SAY_SKELETON_2), me); + DoScriptText(RAND(SAY_SKELETON_1, SAY_SKELETON_2), me); me->DeMorph(); Phase = SKELETAL; uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); std::list<Unit *> playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); @@ -222,12 +222,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2),me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index eb2fc36d3c9..7c605d6d6ca 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -83,16 +83,16 @@ public: { uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; - uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS); - uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiCrushTimer = urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(60*IN_MILLISECONDS, 10*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); bAchiev = IsHeroic(); lSummons.DespawnAll(); - me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); @@ -114,10 +114,10 @@ public: if (uiSpawnTimer <= diff) { - uint32 spawnNumber = urand(2,DUNGEON_MODE(3,5)); + uint32 spawnNumber = urand(2, DUNGEON_MODE(3, 5)); for (uint8 i = 0; i < spawnNumber; ++i) - DoSummon(RAND(NPC_DRAKKARI_INVADER_1,NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + DoSummon(RAND(NPC_DRAKKARI_INVADER_1, NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiConsumeTimer <= diff) @@ -129,7 +129,7 @@ public: if (bAchiev) { - Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pConsumeAura && pConsumeAura->GetStackAmount() > 9) bAchiev = false; } @@ -137,20 +137,20 @@ public: if (uiCrushTimer <= diff) { DoCastVictim(SPELL_CRUSH); - uiCrushTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCrushTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCrushTimer -= diff; if (uiInfectedWoundTimer <= diff) { DoCastVictim(SPELL_INFECTED_WOUND); - uiInfectedWoundTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiInfectedWoundTimer -= diff; if (uiExplodeCorpseTimer <= diff) { DoCast(SPELL_CORPSE_EXPLODE); DoScriptText(SAY_EXPLODE, me); - uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); + uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); } else uiExplodeCorpseTimer -= diff; DoMeleeAttackIfReady(); 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 fb992f0ca8a..8be1d4b7538 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -211,7 +211,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2,data3; + uint16 data0, data1, data2, data3; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; 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 00c674907db..63c8cbe85b2 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 @@ -61,7 +61,7 @@ enum Spells SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual SPELL_WAILING_SOULS = 68873, // the actual spell H_SPELL_WAILING_SOULS = 70324, -// 68871,68873,68875,68876,68899,68912,70324, +// 68871, 68873, 68875, 68876, 68899, 68912, 70324, // 68899 trigger 68871 }; @@ -288,7 +288,7 @@ class boss_devourer_of_souls : public CreatureScript case EVENT_WAILING_SOULS: me->SetDisplayId(DISPLAY_DESIRE); - DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me); + DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL, SAY_FACE_DESIRE_WAILING_SOUL), me); DoScriptText(EMOTE_WAILING_SOUL, me); DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -332,7 +332,7 @@ class boss_devourer_of_souls : public CreatureScript me->SetDisplayId(DISPLAY_ANGER); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); me->GetMotionMaster()->MoveChase(me->getVictim()); - events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); + events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000)); } break; } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index d0e1794be95..28d9e406e92 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -79,7 +79,7 @@ public: events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. } void JustDied(Unit* /*killer*/) @@ -92,7 +92,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -122,7 +122,7 @@ public: break; case EVENT_DEFILING_HORROR: DoCast(SPELL_DEFILING_HORROR); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. break; } @@ -131,7 +131,7 @@ public: || (uiHopelessnessCount < 3 && HealthBelowPct(10))) { uiHopelessnessCount++; - DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS,H_SPELL_HOPELESSNESS)); + DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS, H_SPELL_HOPELESSNESS)); } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index c8c512e8d98..6574846831e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -89,7 +89,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -114,7 +114,7 @@ public: events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); break; case EVENT_CORRUPTED_FLESH: - DoScriptText(RAND(SAY_CORRUPTED_FLESH_1,SAY_CORRUPTED_FLESH_2), me); + DoScriptText(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2), me); DoCast(SPELL_CORRUPTED_FLESH); events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; 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 0cc1633ce58..a6307f3c796 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -683,7 +683,7 @@ public: return; case EVENT_DARK_MENDING: // find an ally with missing HP - if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000,50000))) + if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { DoCast(pTarget, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); 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 373ad249f9b..b82ac92bd9f 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 @@ -44,56 +44,56 @@ enum Events static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = { - {5277.74f,2016.88f,707.778f,5.96903f}, - {5295.88f,2040.34f,707.778f,5.07891f}, - {5320.37f,1980.13f,707.778f,2.00713f}, - {5280.51f,1997.84f,707.778f,0.296706f}, - {5302.45f,2042.22f,707.778f,4.90438f}, - {5306.57f,1977.47f,707.778f,1.50098f}, + {5277.74f, 2016.88f, 707.778f, 5.96903f}, + {5295.88f, 2040.34f, 707.778f, 5.07891f}, + {5320.37f, 1980.13f, 707.778f, 2.00713f}, + {5280.51f, 1997.84f, 707.778f, 0.296706f}, + {5302.45f, 2042.22f, 707.778f, 4.90438f}, + {5306.57f, 1977.47f, 707.778f, 1.50098f}, }; static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = { - {5312.75f,2037.12f,707.778f,4.59022f}, - {5309.58f,2042.67f,707.778f,4.69494f}, - {5275.08f,2008.72f,707.778f,6.21337f}, - {5279.65f,2004.66f,707.778f,0.069813f}, - {5275.48f,2001.14f,707.778f,0.174533f}, - {5316.7f,2041.55f,707.778f,4.50295f}, + {5312.75f, 2037.12f, 707.778f, 4.59022f}, + {5309.58f, 2042.67f, 707.778f, 4.69494f}, + {5275.08f, 2008.72f, 707.778f, 6.21337f}, + {5279.65f, 2004.66f, 707.778f, 0.069813f}, + {5275.48f, 2001.14f, 707.778f, 0.174533f}, + {5316.7f, 2041.55f, 707.778f, 4.50295f}, }; static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = { - {5302.25f,1972.41f,707.778f,1.37881f}, - {5311.03f,1972.23f,707.778f,1.64061f}, - {5277.36f,1993.23f,707.778f,0.401426f}, - {5318.7f,2036.11f,707.778f,4.2237f}, - {5335.72f,1996.86f,707.778f,2.74017f}, - {5299.43f,1979.01f,707.778f,1.23918f}, + {5302.25f, 1972.41f, 707.778f, 1.37881f}, + {5311.03f, 1972.23f, 707.778f, 1.64061f}, + {5277.36f, 1993.23f, 707.778f, 0.401426f}, + {5318.7f, 2036.11f, 707.778f, 4.2237f}, + {5335.72f, 1996.86f, 707.778f, 2.74017f}, + {5299.43f, 1979.01f, 707.778f, 1.23918f}, }; static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = { - {5306.06f,2037,707.778f,4.81711f}, - {5344.15f,2007.17f,707.778f,3.15905f}, - {5337.83f,2010.06f,707.778f,3.22886f}, - {5343.29f,1999.38f,707.778f,2.9147f}, - {5340.84f,1992.46f,707.778f,2.75762f}, - {5325.07f,1977.6f,707.778f,2.07694f}, - {5336.6f,2017.28f,707.778f,3.47321f}, - {5313.82f,1978.15f,707.778f,1.74533f}, - {5280.63f,2012.16f,707.778f,6.05629f}, - {5322.96f,2040.29f,707.778f,4.34587f}, + {5306.06f, 2037, 707.778f, 4.81711f}, + {5344.15f, 2007.17f, 707.778f, 3.15905f}, + {5337.83f, 2010.06f, 707.778f, 3.22886f}, + {5343.29f, 1999.38f, 707.778f, 2.9147f}, + {5340.84f, 1992.46f, 707.778f, 2.75762f}, + {5325.07f, 1977.6f, 707.778f, 2.07694f}, + {5336.6f, 2017.28f, 707.778f, 3.47321f}, + {5313.82f, 1978.15f, 707.778f, 1.74533f}, + {5280.63f, 2012.16f, 707.778f, 6.05629f}, + {5322.96f, 2040.29f, 707.778f, 4.34587f}, }; static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = { - {5343.47f,2015.95f,707.778f,3.49066f}, - {5337.86f,2003.4f,707.778f,2.98451f}, - {5319.16f,1974,707.778f,1.91986f}, - {5299.25f,2036,707.778f,5.02655f}, - {5295.64f,1973.76f,707.778f,1.18682f}, - {5282.9f,2019.6f,707.778f,5.88176f}, + {5343.47f, 2015.95f, 707.778f, 3.49066f}, + {5337.86f, 2003.4f, 707.778f, 2.98451f}, + {5319.16f, 1974, 707.778f, 1.91986f}, + {5299.25f, 2036, 707.778f, 5.02655f}, + {5295.64f, 1973.76f, 707.778f, 1.18682f}, + {5282.9f, 2019.6f, 707.778f, 5.88176f}, }; class instance_halls_of_reflection : public InstanceMapScript @@ -184,22 +184,22 @@ public: { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, false, go); break; case GO_FROSTMOURNE_ALTAR: uiFrostmourneAltar = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_FRONT_DOOR: uiFrontDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_ARTHAS_DOOR: uiArthasDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); if (uiEncounter[1] == DONE) HandleGameObject(0, true, go); @@ -384,19 +384,19 @@ public: // TODO: do composition at random. # of spawn also depends on uiWaveCount // As of now, it is just one of each. - index = urand(0,ENCOUNTER_WAVE_MERCENARY-1); + index = urand(0, ENCOUNTER_WAVE_MERCENARY-1); pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_FOOTMAN-1); + index = urand(0, ENCOUNTER_WAVE_FOOTMAN-1); pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_RIFLEMAN-1); + index = urand(0, ENCOUNTER_WAVE_RIFLEMAN-1); pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_PRIEST-1); + index = urand(0, ENCOUNTER_WAVE_PRIEST-1); pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_MAGE-1); + index = urand(0, ENCOUNTER_WAVE_MAGE-1); pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 403feb7cf3e..a906fe03d12 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -97,12 +97,12 @@ class boss_drakkari_colossus : public CreatureScript if (GetData(DATA_INTRO_DONE)) { me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); } //events.Reset(); -> done in _Reset(); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000,30000)); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000, 30000)); phase = COLOSSUS_PHASE_NORMAL; @@ -149,8 +149,8 @@ class boss_drakkari_colossus : public CreatureScript me->GetMotionMaster()->MoveIdle(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); - DoCast(me,SPELL_FREEZE_ANIM); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + DoCast(me, SPELL_FREEZE_ANIM); break; case ACTION_UNFREEZE_COLOSSUS: @@ -158,13 +158,13 @@ class boss_drakkari_colossus : public CreatureScript return; me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); me->SetInCombatWithZone(); if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim(), 0,0); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); break; } @@ -172,7 +172,7 @@ class boss_drakkari_colossus : public CreatureScript void DamageTaken(Unit* /*attacker*/, uint32& damage) { - if (me->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE)) + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) damage = 0; if (phase == COLOSSUS_PHASE_NORMAL || @@ -220,8 +220,8 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(),SPELL_MIGHTY_BLOW); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000,15000)); + DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } } @@ -258,16 +258,16 @@ class boss_drakkari_elemental : public CreatureScript { boss_drakkari_elementalAI(Creature* creature) : ScriptedAI(creature) { - DoCast(me,SPELL_ELEMENTAL_SPAWN_EFFECT); + DoCast(me, SPELL_ELEMENTAL_SPAWN_EFFECT); instance = creature->GetInstanceScript(); } void Reset() { events.Reset(); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); - me->AddAura(SPELL_MOJO_VOLLEY,me); + me->AddAura(SPELL_MOJO_VOLLEY, me); } void JustDied(Unit* killer) @@ -299,8 +299,8 @@ class boss_drakkari_elemental : public CreatureScript case EVENT_SURGE: DoCast(SPELL_SURGE_VISUAL); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) - DoCast(target,SPELL_SURGE); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + DoCast(target, SPELL_SURGE); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); break; } } @@ -318,7 +318,7 @@ class boss_drakkari_elemental : public CreatureScript { if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS))) // what if the elemental is more than 80 yards from drakkari colossus ? - DoCast(colossus,SPELL_MERGE,true); + DoCast(colossus, SPELL_MERGE, true); } break; } @@ -345,7 +345,7 @@ class boss_drakkari_elemental : public CreatureScript if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) return; - me->GetMotionMaster()->MovePoint(0,colossus->GetPositionX(),colossus->GetPositionY(),colossus->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, colossus->GetPositionX(), colossus->GetPositionY(), colossus->GetPositionZ()); return; }*/ DoAction(ACTION_RETURN_TO_COLOSSUS); @@ -408,13 +408,13 @@ public: void MoveMojos(Creature* boss) { std::list<Creature*> mojosList; - boss->GetCreatureListWithEntryInGrid(mojosList,me->GetEntry(),12.0f); + boss->GetCreatureListWithEntryInGrid(mojosList, me->GetEntry(), 12.0f); if (!mojosList.empty()) { for (std::list<Creature*>::const_iterator itr = mojosList.begin(); itr != mojosList.end(); ++itr) { if (Creature* mojo = *itr) - mojo->GetMotionMaster()->MovePoint(1,boss->GetHomePosition().GetPositionX(),boss->GetHomePosition().GetPositionY(),boss->GetHomePosition().GetPositionZ()); + mojo->GetMotionMaster()->MovePoint(1, boss->GetHomePosition().GetPositionX(), boss->GetHomePosition().GetPositionY(), boss->GetHomePosition().GetPositionZ()); } } } @@ -430,7 +430,7 @@ public: { colossus->AI()->DoAction(ACTION_UNFREEZE_COLOSSUS); if (!colossus->AI()->GetData(DATA_INTRO_DONE)) - colossus->AI()->SetData(DATA_INTRO_DONE,true); + colossus->AI()->SetData(DATA_INTRO_DONE, true); colossus->SetInCombatWithZone(); me->DespawnOrUnsummon(); } @@ -451,7 +451,7 @@ public: Position colossusHomePosition; colossus->GetHomePosition().GetPosition(&colossusHomePosition); - float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ()); + float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(), colossusHomePosition.GetPositionY(), colossusHomePosition.GetPositionZ()); if (distance < 12.0f) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 64a32fbfcec..d0825f79af0 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -57,7 +57,7 @@ public: void Reset() { - uiBerserkTimer = urand(60*IN_MILLISECONDS,90*IN_MILLISECONDS); //60-90 secs according to wowwiki + uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki uiBiteTimer = 5*IN_MILLISECONDS; uiSpitTimer = 10*IN_MILLISECONDS; uiSpringTimer = 8*IN_MILLISECONDS; @@ -83,22 +83,22 @@ public: if (uiBiteTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_BITE); - uiBiteTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_SPIT); - uiSpitTimer = urand(6*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; if (uiSpringTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); - uiSpringTimer = urand(5*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiSpringTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } } else uiSpringTimer -= diff; @@ -156,7 +156,7 @@ public: { if (pInstance) { - pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID()); + pInstance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID()); if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0) me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index d5f6bcf5a4b..968be40223b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -172,7 +172,7 @@ public: if (uiStampedeTimer <= diff) { DoCast(me, SPELL_STAMPEDE); - DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me); + DoScriptText(RAND(SAY_SUMMON_RHINO_1, SAY_SUMMON_RHINO_2, SAY_SUMMON_RHINO_3), me); uiStampedeTimer = 15*IN_MILLISECONDS; } else uiStampedeTimer -= diff; @@ -277,7 +277,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index e39151551a7..d02a906b79b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -164,7 +164,7 @@ public: if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index e6498c889ac..2d1a6b4a5ea 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -145,23 +145,23 @@ public: { if (uiPhase == 1) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); if (uiPhase == 2) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); uiSpawnTimer = 5*IN_MILLISECONDS; } else uiSpawnTimer -= diff; } if (uiPhase == 0 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON_SNAKES,me); + DoScriptText(SAY_SUMMON_SNAKES, me); uiPhase = 1; } if (uiPhase == 1 && HealthBelowPct(25)) { - DoScriptText(SAY_SUMMON_CONSTRICTORS,me); + DoScriptText(SAY_SUMMON_CONSTRICTORS, me); uiPhase = 2; } @@ -178,12 +178,12 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); lSummons.Summon(summoned); } }; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index e25f9b900a4..a0fdb4cce7b 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -159,11 +159,11 @@ public: case 192518: uiSladRanAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiSladRanStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -174,11 +174,11 @@ public: case 192519: uiMoorabiAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiMoorabiStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -189,11 +189,11 @@ public: case 192520: uiDrakkariColossusAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiDrakkariColossusStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -220,21 +220,21 @@ public: case 192632: uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192569: uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); case 193208: uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193209: uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193188: uiBridge = go->GetGUID(); @@ -261,7 +261,7 @@ public: { GameObject* go = instance->GetGameObject(uiSladRanAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_MOORABI_EVENT: @@ -270,9 +270,9 @@ public: { GameObject* go = instance->GetGameObject(uiMoorabiAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (bHeroicMode) - HandleGameObject(uiEckTheFerociousDoor,true); + HandleGameObject(uiEckTheFerociousDoor, true); } break; case DATA_DRAKKARI_COLOSSUS_EVENT: @@ -281,21 +281,21 @@ public: { GameObject* go = instance->GetGameObject(uiDrakkariColossusAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_GAL_DARAH_EVENT: m_auiEncounter[3] = data; if (data == DONE) { - HandleGameObject(uiGalDarahDoor1,true); - HandleGameObject(uiGalDarahDoor2,true); + HandleGameObject(uiGalDarahDoor1, true); + HandleGameObject(uiGalDarahDoor2, true); } break; case DATA_ECK_THE_FEROCIOUS_EVENT: m_auiEncounter[4] = data; if (bHeroicMode && data == DONE) - HandleGameObject(uiEckTheFerociousDoorBehind,true); + HandleGameObject(uiEckTheFerociousDoorBehind, true); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 101ecf10adb..3a5b289acb0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -619,7 +619,7 @@ class boss_prince_taldaram_icc : public CreatureScript DoZoneInCombat(controller); events.ScheduleEvent(EVENT_BERSERK, 600000); - events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000,15000)); + events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000, 15000)); events.ScheduleEvent(EVENT_CONJURE_FLAME, 20000); } 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 b38448d9f19..05f620db168 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 @@ -78,9 +78,9 @@ static const uint32 vampireAuras[3][MAX_DIFFICULTY] = {70877, 71474, 70877, 71474}, }; -#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867,71473,71532,71533) -#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879,71525,71530,71531) -#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877,71474,70877,71474) +#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867, 71473, 71532, 71533) +#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879, 71525, 71530, 71531) +#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877, 71474, 70877, 71474) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 66d3755ec6f..3f73184248a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -114,7 +114,7 @@ enum Spells }; // Helper to get id of the aura on different modes (HasAura(baseId) wont work) -#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385,72441,72442,72443) +#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385, 72441, 72442, 72443) enum Events { @@ -710,7 +710,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_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 3a0de0d7fc4..e7dfe62184e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -53,8 +53,8 @@ enum Spells }; // Used for HasAura checks -#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195,71219,73031,73032) -#define INOCULATED_HELPER RAID_MODE<uint32>(69291,72101,72102,72103) +#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195, 71219, 73031, 73032) +#define INOCULATED_HELPER RAID_MODE<uint32>(69291, 72101, 72102, 72103) static const uint32 gaseousBlight[3] = {69157, 69162, 69164}; static const uint32 gaseousBlightVisual[3] = {69126, 69152, 69154}; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 6b5ab146e4b..f7b9fdf350e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -176,9 +176,9 @@ enum DeprogrammingData POINT_DESPAWN = 384721, }; -#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10,NPC_DARNAVAN_25,NPC_DARNAVAN_10,NPC_DARNAVAN_25) -#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25,NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25) -#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25,QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25) +#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10, NPC_DARNAVAN_25, NPC_DARNAVAN_10, NPC_DARNAVAN_25) +#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25, NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25) +#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25, QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25) static const uint32 addEntries[2] = {NPC_CULT_FANATIC, NPC_CULT_ADHERENT}; @@ -521,7 +521,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3]); _SummonAdd(addEntries[addIndex], addSpawnPos[addIndexOther*3+1]); _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3+2]); - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); } ++addWaveCounter; } @@ -537,7 +537,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndex], addSpawnPos[addIndex*3+2]); } else - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); ++addWaveCounter; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index ef6e78f13d2..7ef59bb9565 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -101,7 +101,7 @@ enum Spells SPELL_MUTATED_TRANSFORMATION_NAME = 72401, }; -#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672,72455,72832,72833) +#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672, 72455, 72832, 72833) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 809c6cecbf7..e506e5300fc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -61,7 +61,7 @@ enum Spells SPELL_DECIMATE = 71123, }; -#define MUTATED_INFECTION RAID_MODE<int32>(69674,71224,73022,73023) +#define MUTATED_INFECTION RAID_MODE<int32>(69674, 71224, 73022, 73023) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 922957cd106..5708771d83c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -34,7 +34,7 @@ enum Texts SAY_KILL = 8, // Perish! // A flaw of mortality... SAY_BERSERK = 9, // Enough! I tire of these games! - SAY_DEATH = 10,// Free...at last... + SAY_DEATH = 10, // Free...at last... }; enum Spells diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 5b8d0e66206..999676d736d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -18,8 +18,8 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_GREET RAND(-1533000,-1533004,-1533005,-1533006,-1533007) -#define SAY_AGGRO RAND(-1533001,-1533002,-1533003) +#define SAY_GREET RAND(-1533000, -1533004, -1533005, -1533006, -1533007) +#define SAY_AGGRO RAND(-1533001, -1533002, -1533003) #define SAY_SLAY -1533008 #define MOB_CRYPT_GUARD 16573 @@ -116,7 +116,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 600000); if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) - events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000,20000)); + events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } void MoveInLineOfSight(Unit *who) @@ -154,14 +154,14 @@ public: case EVENT_IMPALE: //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm - if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25))) + if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25))) if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10,SPELL_IMPALE_25)); - events.ScheduleEvent(EVENT_IMPALE, urand(10000,20000)); + DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); + events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; case EVENT_LOCUST: // TODO : Add Text - DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25)); + DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25)); DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_LOCUST, 90000); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 7a1c1863937..629fc42dcd6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -78,10 +78,10 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4), me); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); } void Reset() @@ -104,7 +104,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%3)) - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -113,7 +113,7 @@ public: DoScriptText(SAY_DEATH, me); if (instance && bAchievement) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10,ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10, ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); } void UpdateAI(const uint32 diff) @@ -137,23 +137,23 @@ public: switch(eventId) { case EVENT_POISON: - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) - DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY,H_SPELL_POISON_BOLT_VOLLEY)); - events.ScheduleEvent(EVENT_POISON, urand(8000,15000)); + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) + DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY, H_SPELL_POISON_BOLT_VOLLEY)); + events.ScheduleEvent(EVENT_POISON, urand(8000, 15000)); break; case EVENT_FIRE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); break; case EVENT_FRENZY: // TODO : Add Text - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) DoCast(me, RAID_MODE(SPELL_FRENZY, H_SPELL_FRENZY)); else doDelayFrenzy = true; - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); break; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 91f15bcf6ba..fe0e94c76e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -56,26 +56,26 @@ const Position WaypointPositions[12] = const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; const uint32 SPELL_MARK[] = {28832, 28833, 28834, 28835}; -#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i],SPELL_PRIMARY_H[i]) +#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i], SPELL_PRIMARY_H[i]) const uint32 SPELL_PRIMARY_N[] = {28884, 28863, 28882, 28883}; const uint32 SPELL_PRIMARY_H[] = {57467, 57463, 57369, 57466}; -#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i],SPELL_SECONDARY_H[i]) +#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i], SPELL_SECONDARY_H[i]) const uint32 SPELL_SECONDARY_N[]= {0, 57374, 0, 57376}; const uint32 SPELL_SECONDARY_H[]= {0, 57464, 0, 57465}; const uint32 SPELL_PUNISH[] = {0, 57381, 0, 57377}; #define SPELL_BERSERK 26662 -// used by 16063,16064,16065,30549, but signed for 16063 +// used by 16063, 16064, 16065, 30549, but signed for 16063 const int32 SAY_AGGRO[] = {-1533051, -1533044, -1533065, -1533058}; const int32 SAY_TAUNT[3][4] ={ {-1533052, -1533045, -1533071, -1533059}, {-1533053, -1533046, -1533072, -1533060}, - {-1533054, -1533047, -1533073, -1533061},}; + {-1533054, -1533047, -1533073, -1533061}, }; const int32 SAY_SPECIAL[] = {-1533055, -1533048, -1533070, -1533062}; const int32 SAY_SLAY[] = {-1533056, -1533049, -1533068, -1533063}; const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; -#define SAY_BARON_AGGRO RAND(-1533065,-1533066,-1533067) -#define SAY_BARON_SLAY RAND(-1533068,-1533069) +#define SAY_BARON_AGGRO RAND(-1533065, -1533066, -1533067) +#define SAY_BARON_SLAY RAND(-1533068, -1533069) class boss_four_horsemen : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 505938f1be9..dccce84818b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,8 +19,8 @@ #include "naxxramas.h" #define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371,54427) -#define SPELL_DECIMATE RAID_MODE(28374,54426) +#define SPELL_ENRAGE RAID_MODE(28371, 54427) +#define SPELL_DECIMATE RAID_MODE(28374, 54426) #define SPELL_BERSERK 26662 #define SPELL_INFECTED_WOUND 29306 @@ -123,7 +123,7 @@ public: break; case EVENT_SUMMON: for (int32 i = 0; i < RAID_MODE(1, 2); ++i) - DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1,3)]); + DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]); events.ScheduleEvent(EVENT_SUMMON, 10000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bf37f218adc..1d5e3192c61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -427,11 +427,11 @@ public: } if (waves[waveCount].mode == 1) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 2) && (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 0) && (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else events.ScheduleEvent(EVENT_SUMMON, 0); @@ -447,7 +447,7 @@ public: summons.DoAction(0, 0); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_BOLT, 1000); - events.ScheduleEvent(EVENT_HARVEST, urand(3000,15000)); + events.ScheduleEvent(EVENT_HARVEST, urand(3000, 15000)); events.ScheduleEvent(EVENT_TELEPORT, 20000); } break; @@ -457,7 +457,7 @@ public: break; case EVENT_HARVEST: DoCast(me->getVictim(), SPELL_HARVEST_SOUL, true); - events.ScheduleEvent(EVENT_HARVEST, urand(20000,25000)); + events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: if (!thirtyPercentReached) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index cb4e4b9f782..098b22e30ac 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -22,7 +22,7 @@ #define SPELL_POISON_CLOUD 28240 #define SPELL_MUTATING_INJECTION 28169 -#define SPELL_SLIME_SPRAY RAID_MODE(28157,54364) +#define SPELL_SLIME_SPRAY RAID_MODE(28157, 54364) #define SPELL_BERSERK 26662 #define SPELL_POISON_CLOUD_ADD 59116 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 27d9f9757a6..5bf864d8ed3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -18,13 +18,13 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533109,-1533110,-1533111) +#define SAY_AGGRO RAND(-1533109, -1533110, -1533111) #define SAY_SLAY -1533112 -#define SAY_TAUNT RAND(-1533113,-1533114,-1533115,-1533116,-1533117) +#define SAY_TAUNT RAND(-1533113, -1533114, -1533115, -1533116, -1533117) #define SAY_DEATH -1533118 #define SPELL_SPELL_DISRUPTION 29310 -#define SPELL_DECREPIT_FEVER RAID_MODE(29998,55011) +#define SPELL_DECREPIT_FEVER RAID_MODE(29998, 55011) #define SPELL_PLAGUE_CLOUD 29350 enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9d034723299..fff19b5cbb4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -325,7 +325,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -389,13 +389,13 @@ public: switch(eventId) { case EVENT_WASTE: - DoSummon(NPC_WASTE, Pos[RAND(0,3,6,9)]); - events.RepeatEvent(urand(2000,5000)); + DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); + events.RepeatEvent(urand(2000, 5000)); break; case EVENT_ABOMIN: if (nAbomination < 8) { - DoSummon(NPC_ABOMINATION, Pos[RAND(1,4,7,10)]); + DoSummon(NPC_ABOMINATION, Pos[RAND(1, 4, 7, 10)]); nAbomination++; events.RepeatEvent(20000); } @@ -405,7 +405,7 @@ public: case EVENT_WEAVER: if (nWeaver < 8) { - DoSummon(NPC_WEAVER, Pos[RAND(0,3,6,9)]); + DoSummon(NPC_WEAVER, Pos[RAND(0, 3, 6, 9)]); nWeaver++; events.RepeatEvent(25000); } @@ -419,19 +419,19 @@ public: break; case EVENT_PHASE: events.Reset(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); spawns.DespawnAll(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); DoStartMovement(me->getVictim()); - events.ScheduleEvent(EVENT_BOLT, urand(5000,10000)); + events.ScheduleEvent(EVENT_BOLT, urand(5000, 10000)); events.ScheduleEvent(EVENT_NOVA, 15000); - events.ScheduleEvent(EVENT_DETONATE, urand(30000,40000)); - events.ScheduleEvent(EVENT_FISSURE, urand(10000,30000)); - events.ScheduleEvent(EVENT_BLAST, urand(60000,120000)); + events.ScheduleEvent(EVENT_DETONATE, urand(30000, 40000)); + events.ScheduleEvent(EVENT_FISSURE, urand(10000, 30000)); + events.ScheduleEvent(EVENT_BLAST, urand(60000, 120000)); if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL) - events.ScheduleEvent(EVENT_CHAIN, urand(30000,60000)); + events.ScheduleEvent(EVENT_CHAIN, urand(30000, 60000)); Phase = 2; break; default: @@ -463,12 +463,12 @@ public: } } } - else if (nGuardiansOfIcecrownCount < RAID_MODE(2,4)) + else if (nGuardiansOfIcecrownCount < RAID_MODE(2, 4)) { if (uiGuardiansOfIcecrownTimer <= diff) { // TODO : Add missing text - if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2,5,8,11)])) + if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2, 5, 8, 11)])) pGuardian->SetFloatValue(UNIT_FIELD_COMBATREACH, 2); ++nGuardiansOfIcecrownCount; uiGuardiansOfIcecrownTimer = 5000; @@ -484,16 +484,16 @@ public: switch(eventId) { case EVENT_BOLT: - DoCastVictim(RAID_MODE(SPELL_FROST_BOLT,H_SPELL_FROST_BOLT)); - events.RepeatEvent(urand(5000,10000)); + DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); + events.RepeatEvent(urand(5000, 10000)); break; case EVENT_NOVA: - DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE,H_SPELL_FROST_BOLT_AOE)); - events.RepeatEvent(urand(15000,30000)); + DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE, H_SPELL_FROST_BOLT_AOE)); + events.RepeatEvent(urand(15000, 30000)); break; case EVENT_CHAIN: { - uint32 count = urand(1,3); + uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); @@ -507,8 +507,8 @@ public: } } if (!chained.empty()) - DoScriptText(RAND(SAY_CHAIN_1,SAY_CHAIN_2), me); - events.RepeatEvent(urand(100000,180000)); + DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me); + events.RepeatEvent(urand(100000, 180000)); break; } case EVENT_CHAINED_SPELL: @@ -533,7 +533,7 @@ public: switch(player->getClass()) { case CLASS_DRUID: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_MOONFIRE, false); else player->CastSpell(me, SPELL_LIFEBLOOM, false); @@ -551,19 +551,19 @@ public: player->CastSpell(pTarget, RAND(SPELL_BLADESTORM, SPELL_CLEAVE), false); break; case CLASS_PALADIN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_HAMMER_OF_JUSTICE, false); else player->CastSpell(me, SPELL_HOLY_SHOCK, false); break; case CLASS_PRIEST: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_VAMPIRIC_TOUCH, false); else player->CastSpell(me, SPELL_RENEW, false); break; case CLASS_SHAMAN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_EARTH_SHOCK, false); else player->CastSpell(me, SPELL_HEALING_WAVE, false); @@ -572,7 +572,7 @@ public: player->CastSpell(pTarget, RAND(SPELL_HEMORRHAGE, SPELL_MUTILATE), false); break; case CLASS_DEATH_KNIGHT: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_PLAGUE_STRIKE, true); else player->CastSpell(pTarget, SPELL_HOWLING_BLAST, true); @@ -607,23 +607,23 @@ public: std::vector<Unit*>::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); - DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2,SAY_SPECIAL_3), me); + DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me); } - events.RepeatEvent(urand(20000,50000)); + events.RepeatEvent(urand(20000, 50000)); break; } case EVENT_FISSURE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISURE); - events.RepeatEvent(urand(10000,45000)); + events.RepeatEvent(urand(10000, 45000)); break; case EVENT_BLAST: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1,0), 0, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); - events.RepeatEvent(urand(30000,90000)); + events.RepeatEvent(urand(30000, 90000)); break; default: events.PopEvent(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 292d3f16d2b..63a7d69baa8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -76,11 +76,11 @@ public: case EVENT_BLOOM: // TODO : Add missing text DoCastAOE(SPELL_SUMMON_SPORE, true); - DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM,H_SPELL_DEATHBLOOM)); + DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM, H_SPELL_DEATHBLOOM)); events.ScheduleEvent(EVENT_BLOOM, 30000); break; case EVENT_DOOM: - DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM,H_SPELL_INEVITABLE_DOOM)); + DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM, H_SPELL_INEVITABLE_DOOM)); events.ScheduleEvent(EVENT_DOOM, events.GetTimer() < 5*60000 ? 30000 : 15000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f47b806e865..50ee49203d5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -78,8 +78,8 @@ public: enraged = false; events.ScheduleEvent(EVENT_WRAP, 20000); events.ScheduleEvent(EVENT_SPRAY, 40000); - events.ScheduleEvent(EVENT_SHOCK, urand(5000,10000)); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); + events.ScheduleEvent(EVENT_SHOCK, urand(5000, 10000)); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); events.ScheduleEvent(EVENT_SUMMON, 30000); } @@ -102,11 +102,11 @@ public: { case EVENT_WRAP: // TODO : Add missing text - for (uint8 i = 0; i < RAID_MODE(1,2); ++i) + for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { - pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; pTarget->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); if (Creature *wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) @@ -116,24 +116,24 @@ public: events.ScheduleEvent(EVENT_WRAP, 40000); break; case EVENT_SPRAY: - DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); events.ScheduleEvent(EVENT_SPRAY, 40000); break; case EVENT_SHOCK: - DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10,SPELL_POISON_SHOCK_25)); - events.ScheduleEvent(EVENT_SHOCK, urand(10000,20000)); + DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10, SPELL_POISON_SHOCK_25)); + events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10,SPELL_NECROTIC_POISON_25)); + DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: - DoCast(me, RAID_MODE(SPELL_FRENZY_10,SPELL_FRENZY_25), true); + DoCast(me, RAID_MODE(SPELL_FRENZY_10, SPELL_FRENZY_25), true); events.ScheduleEvent(EVENT_FRENZY, 600000); break; case EVENT_SUMMON: // TODO : Add missing text - uint8 amount = urand(8,10); + uint8 amount = urand(8, 10); for (uint8 i = 0; i < amount; ++i) DoSummon(MOB_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_SUMMON, 40000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 1cd130556e9..80174a610ee 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -18,16 +18,16 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533075,-1533076,-1533077) +#define SAY_AGGRO RAND(-1533075, -1533076, -1533077) #define SAY_SUMMON -1533078 -#define SAY_SLAY RAND(-1533079,-1533080) +#define SAY_SLAY RAND(-1533079, -1533080) #define SAY_DEATH -1533081 #define SOUND_DEATH 8848 -#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213,54835) -#define SPELL_BLINK RAND(29208,29209,29210,29211) -#define SPELL_CRIPPLE RAID_MODE(29212,54814) +#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213, 54835) +#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) +#define SPELL_CRIPPLE RAID_MODE(29212, 54814) #define SPELL_TELEPORT 29216 #define MOB_WARRIOR 16984 @@ -157,7 +157,7 @@ public: return; case EVENT_WARRIOR: DoScriptText(SAY_SUMMON, me); - SummonUndead(MOB_WARRIOR, RAID_MODE(2,3)); + SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; case EVENT_BLINK: @@ -180,12 +180,12 @@ public: DoScriptText(SAY_SUMMON, me); switch(balconyCount) { - case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2,4)); break; - case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1,2)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(1,2)); break; - case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2,4)); break; - default:SummonUndead(MOB_CHAMPION, RAID_MODE(5,10)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(5,10));break; + case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; + case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(1, 2)); break; + case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2, 4)); break; + default:SummonUndead(MOB_CHAMPION, RAID_MODE(5, 10)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break; } ++waveCount; events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, 30000 + rand()%15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 42afc0e57a0..e2fe4135996 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -90,7 +90,7 @@ public: { _EnterCombat(); Enraged = false; - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); events.ScheduleEvent(EVENT_HATEFUL, 1200); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -129,7 +129,7 @@ public: if (!pMostHPTarget) pMostHPTarget = me->getVictim(); - DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE,H_SPELL_HATEFUL_STRIKE), true); + DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE, H_SPELL_HATEFUL_STRIKE), true); events.ScheduleEvent(EVENT_HATEFUL, 1200); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 479fda3c875..7056eb0ea33 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -32,14 +32,14 @@ //8860 death - An honorable... death... //8947 - Aggro Mixed? - ? -#define SOUND_AGGRO RAND(8852,8853,8854) -#define SOUND_SLAY RAND(8861,8863) -#define SOUND_COMMND RAND(8855,8856,8858,8859,8861) +#define SOUND_AGGRO RAND(8852, 8853, 8854) +#define SOUND_SLAY RAND(8861, 8863) +#define SOUND_COMMND RAND(8855, 8856, 8858, 8859, 8861) #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 #define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107,55543) +#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) #define SPELL_JAGGED_KNIFE 55550 #define SPELL_HOPELESS 29125 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 0ce6f5e0829..9bd06669d5c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -21,11 +21,11 @@ #define EMOTE_BREATH -1533082 #define EMOTE_ENRAGE -1533083 -#define SPELL_FROST_AURA RAID_MODE(28531,55799) +#define SPELL_FROST_AURA RAID_MODE(28531, 55799) #define SPELL_CLEAVE 19983 -#define SPELL_TAIL_SWEEP RAID_MODE(55697,55696) +#define SPELL_TAIL_SWEEP RAID_MODE(55697, 55696) #define SPELL_SUMMON_BLIZZARD 28560 -#define SPELL_LIFE_DRAIN RAID_MODE(28542,55665) +#define SPELL_LIFE_DRAIN RAID_MODE(28542, 55665) #define SPELL_ICEBOLT 28522 #define SPELL_FROST_BREATH 29318 #define SPELL_FROST_EXPLOSION 28524 @@ -33,7 +33,7 @@ #define SPELL_BERSERK 26662 #define SPELL_DIES 29357 -#define SPELL_CHILL RAID_MODE(28547,55699) +#define SPELL_CHILL RAID_MODE(28547, 55699) #define MOB_BLIZZARD 16474 #define GO_ICEBLOCK 181247 @@ -265,9 +265,9 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000,30000), TEMPSUMMON_TIMED_DESPAWN)) + if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) pSummon->GetMotionMaster()->MoveRandom(40); - events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000,7000), 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; } case EVENT_FLIGHT: @@ -295,7 +295,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_ICEBOLT, 1500); - iceboltCount = RAID_MODE(2,3); + iceboltCount = RAID_MODE(2, 3); return; case EVENT_ICEBOLT: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 9aabf5b315c..c61f5bddc7d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -183,9 +183,9 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); events.ScheduleEvent(EVENT_SHIFT, 30000); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); events.ScheduleEvent(EVENT_BERSERK, 360000); } @@ -237,7 +237,7 @@ public: return; case EVENT_CHAIN: DoCast(me->getVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); @@ -282,7 +282,7 @@ public: if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); - powerSurgeTimer = urand(20000,25000); + powerSurgeTimer = urand(20000, 25000); magneticPullTimer = 20000; } @@ -331,7 +331,7 @@ public: if (powerSurgeTimer <= uiDiff) { DoCast(me, RAID_MODE(SPELL_POWERSURGE, H_SPELL_POWERSURGE)); - powerSurgeTimer = urand(15000,20000); + powerSurgeTimer = urand(15000, 20000); } else powerSurgeTimer -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index ee13dc23c43..c49ac5b67bf 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,8 +20,8 @@ const DoorData doorData[] = { - {181126, BOSS_ANUBREKHAN,DOOR_TYPE_ROOM, BOUNDARY_S}, - {181195, BOSS_ANUBREKHAN,DOOR_TYPE_PASSAGE, 0}, + {181126, BOSS_ANUBREKHAN, DOOR_TYPE_ROOM, BOUNDARY_S}, + {181195, BOSS_ANUBREKHAN, DOOR_TYPE_PASSAGE, 0}, {194022, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_MAEXXNA, DOOR_TYPE_ROOM, BOUNDARY_SW}, @@ -56,7 +56,7 @@ const MinionData minionData[] = {16064, BOSS_HORSEMEN}, {16065, BOSS_HORSEMEN}, {30549, BOSS_HORSEMEN}, - {0, 0,} + {0, 0, } }; enum eEnums diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index c2a9afc3788..3111361a46e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -153,24 +153,24 @@ enum MalygosSays // Sniffed data const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { - {782.9821f,1296.652f,282.1114f}, - {779.5459f,1287.228f,282.1393f}, - {773.0028f,1279.52f,282.4164f}, - {764.3626f,1274.476f,282.4731f}, - {754.3961f,1272.639f,282.4171f}, - {744.4422f,1274.412f,282.222f}, - {735.575f,1279.742f,281.9674f}, - {729.2788f,1287.187f,281.9943f}, - {726.1191f,1296.688f,282.2997f}, - {725.9396f,1306.531f,282.2448f}, - {729.3045f,1316.122f,281.9108f}, - {735.8322f,1323.633f,282.1887f}, - {744.4616f,1328.999f,281.9948f}, - {754.4739f,1330.666f,282.049f}, - {764.074f,1329.053f,281.9949f}, - {772.8409f,1323.951f,282.077f}, - {779.5085f,1316.412f,281.9145f}, - {782.8365f,1306.778f,282.3035f}, + {782.9821f, 1296.652f, 282.1114f}, + {779.5459f, 1287.228f, 282.1393f}, + {773.0028f, 1279.52f, 282.4164f}, + {764.3626f, 1274.476f, 282.4731f}, + {754.3961f, 1272.639f, 282.4171f}, + {744.4422f, 1274.412f, 282.222f}, + {735.575f, 1279.742f, 281.9674f}, + {729.2788f, 1287.187f, 281.9943f}, + {726.1191f, 1296.688f, 282.2997f}, + {725.9396f, 1306.531f, 282.2448f}, + {729.3045f, 1316.122f, 281.9108f}, + {735.8322f, 1323.633f, 282.1887f}, + {744.4616f, 1328.999f, 281.9948f}, + {754.4739f, 1330.666f, 282.049f}, + {764.074f, 1329.053f, 281.9949f}, + {772.8409f, 1323.951f, 282.077f}, + {779.5085f, 1316.412f, 281.9145f}, + {782.8365f, 1306.778f, 282.3035f}, }; #define GROUND_Z 268 @@ -179,22 +179,22 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { - {812.7299f,1391.672f,283.2763f}, - {848.2912f,1358.61f,283.2763f}, - {853.9227f,1307.911f,283.2763f}, - {847.1437f,1265.538f,283.2763f}, - {839.9229f,1245.245f,283.2763f}, - {827.3463f,1221.818f,283.2763f}, - {803.2727f,1203.851f,283.2763f}, - {772.9372f,1197.981f,283.2763f}, - {732.1138f,1200.647f,283.2763f}, - {693.8761f,1217.995f,283.2763f}, - {664.5038f,1256.539f,283.2763f}, - {650.1497f,1303.485f,283.2763f}, - {662.9109f,1350.291f,283.2763f}, - {677.6391f,1377.607f,283.2763f}, - {704.8198f,1401.162f,283.2763f}, - {755.2642f,1417.1f,283.2763f}, + {812.7299f, 1391.672f, 283.2763f}, + {848.2912f, 1358.61f, 283.2763f}, + {853.9227f, 1307.911f, 283.2763f}, + {847.1437f, 1265.538f, 283.2763f}, + {839.9229f, 1245.245f, 283.2763f}, + {827.3463f, 1221.818f, 283.2763f}, + {803.2727f, 1203.851f, 283.2763f}, + {772.9372f, 1197.981f, 283.2763f}, + {732.1138f, 1200.647f, 283.2763f}, + {693.8761f, 1217.995f, 283.2763f}, + {664.5038f, 1256.539f, 283.2763f}, + {650.1497f, 1303.485f, 283.2763f}, + {662.9109f, 1350.291f, 283.2763f}, + {677.6391f, 1377.607f, 283.2763f}, + {704.8198f, 1401.162f, 283.2763f}, + {755.2642f, 1417.1f, 283.2763f}, }; #define MAX_SUMMONS_PHASE_TWO 4 @@ -202,7 +202,7 @@ const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = #define MAX_MALYGOS_POS 2 const Position MalygosPositions[MAX_MALYGOS_POS] = { - {754.544f,1301.71f,320.0f}, + {754.544f, 1301.71f, 320.0f}, {754.39f, 1301.27f, 292.91f} }; @@ -232,14 +232,14 @@ public: bersekerTimer = 0; currentPos = 0; - SetPhase(PHASE_ONE,true); + SetPhase(PHASE_ONE, true); delayedMovementTimer = 8000; delayedMovement = false; summonDeaths = 0; - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); cannotMove = true; } @@ -293,7 +293,7 @@ public: if (!instance) return; - SetPhase(PHASE_THREE,true); + SetPhase(PHASE_THREE, true); // this despawns Hover Disks summons.DespawnAll(); @@ -308,16 +308,16 @@ public: continue; // The rest is handled in the AI of the vehicle. - target->CastSpell(target,SPELL_SUMMOM_RED_DRAGON,true); + target->CastSpell(target, SPELL_SUMMOM_RED_DRAGON, true); } } - if (GameObject* go = GameObject::GetGameObject(*me,instance->GetData64(DATA_PLATFORM))) + if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_PLATFORM))) go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); // In sniffs it has this flag, but i don't know how is applied. // pos sniffed me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } void SetPhaseEvents(uint8 _phase) @@ -325,23 +325,23 @@ public: switch (_phase) { case PHASE_ONE: - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(15,20)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_VORTEX,urand(30,40)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(15, 20)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_VORTEX, urand(30, 40)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, _phase); break; case PHASE_TWO: - events.ScheduleEvent(EVENT_YELL_0,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_1,24*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(2,5)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_0, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_1, 24*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(2, 5)*IN_MILLISECONDS, 0, _phase); break; case PHASE_THREE: - events.ScheduleEvent(EVENT_YELL_2,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_3,8*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_YELL_4,16*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_2, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_3, 8*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_YELL_4, 16*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, _phase); break; default: break; @@ -353,7 +353,7 @@ public: _EnterCombat(); me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(SAY_AGGRO_P_ONE); @@ -409,17 +409,17 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_VORTEX,MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_VORTEX, MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); // continues in MovementInform function. } void ExecuteVortex() { - DoCast(me,SPELL_VORTEX_1,true); - DoCast(me,SPELL_VORTEX_2,true); + DoCast(me, SPELL_VORTEX_1, true); + DoCast(me, SPELL_VORTEX_2, true); // the vortex execution continues in the dummy effect of this spell (see its script) - DoCast(me,SPELL_VORTEX_3,true); + DoCast(me, SPELL_VORTEX_3, true); } void MovementInform(uint32 type, uint32 id) @@ -436,7 +436,7 @@ public: case MOVE_DEEP_BREATH_ROTATION: currentPos = currentPos == MALYGOS_MAX_WAYPOINTS - 1 ? 0 : currentPos+1; me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); break; case MOVE_INIT_PHASE_ONE: me->SetInCombatWithZone(); @@ -451,24 +451,24 @@ public: void StartPhaseTwo() { - SetPhase(PHASE_TWO,true); + SetPhase(PHASE_TWO, true); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[0]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[0]); - Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); + Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_2); - summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[0]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_1); for (uint8 i = 0; i < 2; i++) { // not sure about its position. - summon = me->SummonCreature(NPC_HOVER_DISK_MELEE,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_MELEE, HoverDiskWaypoints[0]); if (summon) summon->SetInCombatWithZone(); } @@ -496,7 +496,7 @@ public: if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE) { me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } } } @@ -506,7 +506,7 @@ public: { if (delayedMovementTimer <= diff) { - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); delayedMovementTimer = 8000; delayedMovement = false; } delayedMovementTimer -= diff; @@ -544,38 +544,38 @@ public: Talk(SAY_AGGRO_P_TWO); break; case EVENT_ARCANE_BREATH: - DoCast(me->getVictim(),SPELL_ARCANE_BREATH); - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(35,60)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_BREATH); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(35, 60)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_ARCANE_STORM: - DoCast(me->getVictim(),SPELL_ARCANE_STORM); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_STORM); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_VORTEX: PrepareForVortex(); - events.ScheduleEvent(EVENT_VORTEX,urand(60,80)*IN_MILLISECONDS,0,PHASE_ONE); + events.ScheduleEvent(EVENT_VORTEX, urand(60, 80)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_POWER_SPARKS: - instance->SetData(DATA_POWER_SPARKS_HANDLING,0); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,PHASE_ONE); + instance->SetData(DATA_POWER_SPARKS_HANDLING, 0); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_SURGE_POWER: me->GetMotionMaster()->MoveIdle(); delayedMovement = true; DoCast(SPELL_SURGE_POWER); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SUMMON_ARCANE: DoCast(SPELL_SUMMON_ARCANE_BOMB); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(12,15)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(12, 15)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SURGE_POWER_PHASE_3: - DoCast(GetTargetPhaseThree(),SPELL_SURGE_POWER_PHASE_3); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_SURGE_POWER_PHASE_3); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, PHASE_THREE); break; case EVENT_STATIC_FIELD: - DoCast(GetTargetPhaseThree(),SPELL_STATIC_FIELD); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_STATIC_FIELD); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, PHASE_THREE); break; default: break; @@ -587,7 +587,7 @@ public: Unit* GetTargetPhaseThree() { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); // we are a drake if (target->GetVehicleKit()) @@ -643,7 +643,7 @@ public: // each player will enter to the trigger vehicle (entry 30090) already spawned (each one can hold up to 5 players, it has 5 seats) // the players enter to the vehicles casting SPELL_VORTEX_4 OR SPELL_VORTEX_5 if (InstanceScript* instance = caster->GetInstanceScript()) - instance->SetData(DATA_VORTEX_HANDLING,0); + instance->SetData(DATA_VORTEX_HANDLING, 0); // the rest of the vortex execution continues when SPELL_VORTEX_2 is removed. } @@ -735,23 +735,23 @@ public: void Reset() { - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } void UpdateAI(const uint32 diff) { if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) && !me->HasAura(SPELL_PORTAL_OPENED)) - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { me->RemoveAura(SPELL_PORTAL_OPENED); - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); } } } @@ -762,7 +762,7 @@ public: if (summonTimer <= diff) { DoCast(SPELL_SUMMON_POWER_PARK); - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } else summonTimer -= diff; } @@ -808,8 +808,8 @@ public: if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -818,7 +818,7 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { @@ -833,7 +833,7 @@ public: } if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -842,7 +842,7 @@ public: if (damage > me->GetMaxHealth()) { damage = 0; - DoCast(me,SPELL_POWER_SPARK_DEATH,true); + DoCast(me, SPELL_POWER_SPARK_DEATH, true); me->DespawnOrUnsummon(1000); } } @@ -893,11 +893,11 @@ public: // This will only be called if the passenger dies if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - malygos->AI()->SetData(DATA_SUMMON_DEATHS,malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); } - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } me->GetMotionMaster()->MoveIdle(); @@ -906,8 +906,8 @@ public: { // Hack: Fall ground function can fail (remember the platform is a gameobject), we will teleport the disk to the ground if (me->GetPositionZ() > GROUND_Z) - me->NearTeleportTo(me->GetPositionX(),me->GetPositionY(),GROUND_Z,0); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), GROUND_Z, 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); me->setFaction(FACTION_FRIENDLY); me->AI()->EnterEvadeMode(); } @@ -928,14 +928,14 @@ public: { case ACTION_HOVER_DISK_START_WP_1: for (uint8 i = 0; i < MAX_HOVER_DISK_WAYPOINTS; i++) - AddWaypoint(i,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(i, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); break; case ACTION_HOVER_DISK_START_WP_2: { uint8 count = 0; for (uint8 i = MAX_HOVER_DISK_WAYPOINTS-1; i > 0; i--) { - AddWaypoint(count,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(count, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); count++; } break; @@ -944,7 +944,7 @@ public: return; } - Start(true,false,0,0,false,true); + Start(true, false, 0, 0, false, true); } void UpdateEscortAI(const uint32 /*diff*/) @@ -985,7 +985,7 @@ public: void Reset() { - DoCast(me,SPELL_ARCANE_OVERLOAD,false); + DoCast(me, SPELL_ARCANE_OVERLOAD, false); } void UpdateAI(const uint32 diff) @@ -1023,12 +1023,12 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { - summoner->CastSpell(me,SPELL_RIDE_RED_DRAGON,true); - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + summoner->CastSpell(me, SPELL_RIDE_RED_DRAGON, true); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { float victim_threat = malygos->getThreatManager().getThreat(summoner); malygos->getThreatManager().resetAllAggro(); @@ -1084,7 +1084,7 @@ public: { events.Reset(); - events.ScheduleEvent(EVENT_YELL_1,0); + events.ScheduleEvent(EVENT_YELL_1, 0); } void UpdateAI(const uint32 diff) @@ -1095,15 +1095,15 @@ public: { case EVENT_YELL_1: Talk(SAY_ONE); - events.ScheduleEvent(EVENT_YELL_2,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_2, 4*IN_MILLISECONDS); break; case EVENT_YELL_2: Talk(SAY_TWO); - events.ScheduleEvent(EVENT_YELL_3,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_3, 4*IN_MILLISECONDS); break; case EVENT_YELL_3: Talk(SAY_THREE); - events.ScheduleEvent(EVENT_YELL_4,7*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_4, 7*IN_MILLISECONDS); break; case EVENT_YELL_4: Talk(SAY_FOUR); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index a28b5258e4b..c2a9978d1d3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -62,17 +62,17 @@ public: } } - SpawnGameObject(GO_FOCUSING_IRIS,focusingIrisPosition); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_FOCUSING_IRIS, focusingIrisPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); if (GameObject* platform = instance->GetGameObject(platformGUID)) platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); } else if (state == DONE) { if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->SummonCreature(NPC_ALEXSTRASZA,829.0679f,1244.77f,279.7453f,2.32f); + malygos->SummonCreature(NPC_ALEXSTRASZA, 829.0679f, 1244.77f, 279.7453f, 2.32f); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); // we make the platform appear again because at the moment we don't support looting using a vehicle if (GameObject* platform = instance->GetGameObject(platformGUID)) @@ -89,9 +89,9 @@ public: void SpawnGameObject(uint32 entry, Position& pos) { GameObject* go = new GameObject; - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),entry, instance, - PHASEMASK_NORMAL, pos.GetPositionX(),pos.GetPositionY(),pos.GetPositionZ(),pos.GetOrientation(), - 0,0,0,0,120,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, instance, + PHASEMASK_NORMAL, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), + 0, 0, 0, 0, 120, GO_STATE_READY)) { delete go; return; @@ -143,7 +143,7 @@ public: { go->Delete(); // this is not the best way. if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->GetMotionMaster()->MovePoint(4,770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE + malygos->GetMotionMaster()->MovePoint(4, 770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE if (GameObject* exitPortal = instance->GetGameObject(exitPortalGUID)) exitPortal->Delete(); @@ -176,7 +176,7 @@ public: if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; - player->CastSpell(trigger,SPELL_VORTEX_4,true); + player->CastSpell(trigger, SPELL_VORTEX_4, true); counter++; } } @@ -196,7 +196,7 @@ public: if (Creature* trigger = instance->GetCreature(*itr_trigger)) { lastPortalGUID = trigger->GetGUID(); - trigger->CastSpell(trigger,SPELL_PORTAL_OPENED,true); + trigger->CastSpell(trigger, SPELL_PORTAL_OPENED, true); return; } } @@ -206,7 +206,7 @@ public: } } - void SetData(uint32 data,uint32 /*value*/) + void SetData(uint32 data, uint32 /*value*/) { switch (data) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index ffdd038ace3..001547379a3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -149,7 +149,7 @@ public: Phase = 1; DoScriptText(SAY_SHIELD, me); DoCast(me, SPELL_RIFT_SHIELD); - Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); + Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); @@ -215,7 +215,7 @@ public: void JustDied(Unit * /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) - CAST_AI(boss_anomalus::boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; + CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true; } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 07a943a0234..c7fa97899a1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -82,7 +82,7 @@ public: void Reset() { uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); uiTailSweepTimer = 5*IN_MILLISECONDS; bEnrage = false; @@ -214,7 +214,7 @@ public: DoCast(me, SPELL_CRYSTALIZE); else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CRYSTAL_CHAINS); - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index eaca718d419..1fd13bc1619 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -256,7 +256,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } @@ -273,7 +273,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 431740b8e08..360e003c0ca 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -195,7 +195,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid()); + Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) { pTarget = pTemp; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 9853b98487e..58203f95a40 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -75,9 +75,9 @@ public: { _Reset(); - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); - events.ScheduleEvent(EVENT_STOMP,17000); - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); + events.ScheduleEvent(EVENT_STOMP, 17000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); postPull = false; } @@ -110,21 +110,21 @@ public: for (uint8 i = 0; i <= (postPull ? 3 : 0); i++) { - me->GetRandomNearPosition(pPosition, float(urand(0,10))); + me->GetRandomNearPosition(pPosition, float(urand(0, 10))); me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); } } - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); break; case EVENT_MAGIC_PULL: DoCast(SPELL_MAGIC_PULL); postPull = true; - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); break; case EVENT_STOMP: - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me); DoCast(SPELL_THUNDERING_STOMP); - events.ScheduleEvent(EVENT_STOMP,17000); + events.ScheduleEvent(EVENT_STOMP, 17000); break; } } @@ -144,7 +144,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); } private: bool postPull; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 51b75f19f7e..e6520806a68 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -92,7 +92,7 @@ enum AmberDrake SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. // SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. //you do not have access to until you kill the Mage-Lord Urom. - SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. + SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15, 000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. }; /*Emerald Drake, @@ -105,7 +105,7 @@ enum EmeraldDrake SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346 SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times. - SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. + SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25, 000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. // you do not have access to until you kill the Mage-Lord Urom SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. }; @@ -145,10 +145,10 @@ public: if (action != ACTION_SET_NORMAL_EVENTS) return; - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); } void JustSummoned(Creature* summon) @@ -169,7 +169,7 @@ public: return; // TO-DO: See why the spell is not casted - summon->CastSpell(summon,SPELL_PLANAR_BLAST,true); + summon->CastSpell(summon, SPELL_PLANAR_BLAST, true); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) @@ -208,22 +208,22 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->getVictim(),SPELL_ARCANE_BARRAGE); - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: DoCastAOE(SPELL_ARCANE_VOLLEY); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ENRAGED_ASSAULT: Talk(SAY_ENRAGE); DoCast(SPELL_ENRAGED_ASSAULT); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_SUMMON_LEY_WHELP: for (uint8 i = 0; i < 3; i++) DoCast(SPELL_SUMMON_LEY_WHELP); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; } } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index a5bcd92b8ee..07188b1a08b 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -78,12 +78,12 @@ static Summons Group[]= static uint32 TeleportSpells[]= { - SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3 + SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3 }; static int32 SayAggro[]= { - SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4 + SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4 }; class boss_urom : public CreatureScript @@ -98,7 +98,7 @@ public: struct boss_uromAI : public BossAI { - boss_uromAI(Creature* creature) : BossAI(creature,DATA_UROM_EVENT) {} + boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) {} void Reset() { @@ -120,11 +120,11 @@ public: me->GetMotionMaster()->MoveIdle(); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); arcaneExplosionTimer = 9000; castArcaneExplosionTimer = 2000; - frostBombTimer = urand(5000,8000); - timeBombTimer = urand(20000,25000); + frostBombTimer = urand(5000, 8000); + timeBombTimer = urand(20000, 25000); } void EnterCombat(Unit* /*pWho*/) @@ -136,7 +136,7 @@ public: CastTeleport(); if (instance->GetData(DATA_UROM_PLATAFORM) != 3) - instance->SetData(DATA_UROM_PLATAFORM,instance->GetData(DATA_UROM_PLATAFORM)+1); + instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } void AttackStart(Unit* pWho) @@ -151,12 +151,12 @@ public: { if (me->Attack(pWho, true)) { - DoScriptText(SayAggro[3],me); + DoScriptText(SayAggro[3], me); me->SetInCombatWith(pWho); pWho->SetInCombatWith(me); - me->GetMotionMaster()->MoveChase(pWho, 0,0); + me->GetMotionMaster()->MoveChase(pWho, 0, 0); } } } @@ -169,7 +169,7 @@ public: while (group[0] == group[1] || group[0] == group[2] || group[1] == group[2]) { for (uint8 i = 0; i < 3; i++) - group[i] = urand(0,2); + group[i] = urand(0, 2); } } @@ -206,7 +206,7 @@ public: for (uint8 i = 0; i < 4 ; i++) { SetPosition(i); - me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i],x,y,me->GetPositionZ(),me->GetOrientation()); + me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i], x, y, me->GetPositionZ(), me->GetOrientation()); } } @@ -215,7 +215,7 @@ public: if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2) return; - DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)],me); + DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me); DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } @@ -231,10 +231,10 @@ public: if (teleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT,me); + DoScriptText(SAY_TELEPORT, me); me->GetMotionMaster()->MoveIdle(); DoCast(SPELL_TELEPORT); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); } else teleportTimer -= uiDiff; @@ -256,8 +256,8 @@ public: Position pPos; me->getVictim()->GetPosition(&pPos); - me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(),0,0); + me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation()); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); canCast = false; @@ -271,15 +271,15 @@ public: if (frostBombTimer <= uiDiff) { DoCastVictim(SPELL_FROSTBOMB); - frostBombTimer = urand(5000,8000); + frostBombTimer = urand(5000, 8000); } else frostBombTimer -= uiDiff; if (timeBombTimer <= uiDiff) { if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit,SPELL_TIME_BOMB); + DoCast(pUnit, SPELL_TIME_BOMB); - timeBombTimer = urand(20000,25000); + timeBombTimer = urand(20000, 25000); } else timeBombTimer -= uiDiff; } @@ -303,15 +303,15 @@ public: switch(pSpell->Id) { case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f); + me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f); + me->SetHomePosition(1164.02f, 1170.85f, 527.321f, 3.66f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f); + me->SetHomePosition(1118.31f, 1080.377f, 508.361f, 4.25f); LeaveCombat(); break; case SPELL_TELEPORT: @@ -323,7 +323,7 @@ public: } } private: - float x,y; + float x, y; bool canCast; bool canGoBack; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 273fa33414f..d7025897eb8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -65,17 +65,17 @@ public: boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT) { if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE) - DoCast(me,SPELL_CENTRIFUGE_SHIELD); + DoCast(me, SPELL_CENTRIFUGE_SHIELD); } void Reset() { _Reset(); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20, 25) * IN_MILLISECONDS); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); // not sure if this is handled by a timer or hp percentage - events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(15, 30) * IN_MILLISECONDS); firstCoreEnergize = false; coreEnergizeOrientation = 0.0f; @@ -109,7 +109,7 @@ public: switch (eventId) { case EVENT_ENERGIZE_CORES: - DoCast(me,SPELL_ENERGIZE_CORES); + DoCast(me, SPELL_ENERGIZE_CORES); events.CancelEvent(EVENT_ENERGIZE_CORES); break; case EVENT_ENERGIZE_CORES_VISUAL: @@ -120,20 +120,20 @@ public: } else coreEnergizeOrientation = MapManager::NormalizeOrientation(coreEnergizeOrientation - 2.0f); - DoCast(me,SPELL_ENERGIZE_CORES_VISUAL); + DoCast(me, SPELL_ENERGIZE_CORES_VISUAL); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4000); break; case EVENT_CALL_AZURE: // not sure how blizz handles this, i cant see any pattern between the differnt spells - DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN); + DoCast(me, SPELL_CALL_AZURE_RING_CAPTAIN); Talk(SAY_AZURE); Talk(SAY_AZURE_EMOTE); - events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->getVictim(),SPELL_CALL_AMPLIFY_MAGIC); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17,20) * IN_MILLISECONDS); + DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } } @@ -177,7 +177,7 @@ class npc_azure_ring_captain : public CreatureScript { if (spell->Id == SPELL_ICE_BEAM) { - target->CastSpell(target,SPELL_SUMMON_ARCANE_BEAM,true); + target->CastSpell(target, SPELL_SUMMON_ARCANE_BEAM, true); me->DespawnOrUnsummon(); } } @@ -198,8 +198,8 @@ class npc_azure_ring_captain : public CreatureScript me->GetMotionMaster()->MoveIdle(); - if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID)) - DoCast(target,SPELL_ICE_BEAM); + if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) + DoCast(target, SPELL_ICE_BEAM); } void DoAction(const int32 action) @@ -209,13 +209,13 @@ class npc_azure_ring_captain : public CreatureScript case ACTION_CALL_DRAGON_EVENT: if (instance) { - if (Creature* varos = ObjectAccessor::GetCreature(*me,instance->GetData64(DATA_VAROS))) + if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VAROS))) { - if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->SetReactState(REACT_PASSIVE); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT,victim->GetPositionX(),victim->GetPositionY(),victim->GetPositionZ() + 20.0f); + me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT, victim->GetPositionX(), victim->GetPositionY(), victim->GetPositionZ() + 20.0f); targetGUID = victim->GetGUID(); } } @@ -269,7 +269,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void Register() { - OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0,SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -298,14 +298,14 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) @@ -345,14 +345,14 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index a4576f2aa82..41aa988583d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -61,7 +61,7 @@ public: if (creature->GetEntry() != NPC_CENTRIFUGE_CONSTRUCT) return; - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,--centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, --centrifugueConstructCounter); if (!centrifugueConstructCounter) if (Creature* varos = instance->GetCreature(varosGUID)) @@ -72,12 +72,12 @@ public: { if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); } else { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 0); } } @@ -95,7 +95,7 @@ public: if (!varos) return; - if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN,varos->GetPositionX(),varos->GetPositionY(),varos->GetPositionZ()+40)) + if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN, varos->GetPositionX(), varos->GetPositionY(), varos->GetPositionZ()+40)) drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT); } @@ -117,7 +117,7 @@ public: break; case NPC_CENTRIFUGE_CONSTRUCT: if (creature->isAlive()) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,++centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter); break; } } @@ -145,14 +145,14 @@ public: case DATA_DRAKOS_EVENT: if (state == DONE) { - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); OpenCageDoors(); } break; case DATA_VAROS_EVENT: if (state == DONE) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); break; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 71313f54d59..d6c2942d16a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -26,7 +26,7 @@ #define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight" #define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?" -#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1)) +#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE, 1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE, 1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE, 1)) enum Drakes { diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index fd75d1d28ce..bc844698fdb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -141,11 +141,11 @@ struct Waypoint struct Location { - float x,y,z; + float x, y, z; }; struct Locations { - float x,y,z; + float x, y, z; }; //each dragons special points. First where fly to before connect to connon, second where land point is. @@ -307,7 +307,7 @@ public: { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); - pTenebron->AI()->SetData(DATA_CAN_LOOT,0); + pTenebron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -325,7 +325,7 @@ public: { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); - pShadron->AI()->SetData(DATA_CAN_LOOT,0); + pShadron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -343,7 +343,7 @@ public: { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); - pVesperon->AI()->SetData(DATA_CAN_LOOT,0); + pVesperon->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -358,7 +358,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SARTHARION_AGGRO,me); + DoScriptText(SAY_SARTHARION_AGGRO, me); DoZoneInCombat(); if (pInstance) @@ -370,7 +370,7 @@ public: void JustDied(Unit* /*pKiller*/) { - DoScriptText(SAY_SARTHARION_DEATH,me); + DoScriptText(SAY_SARTHARION_DEATH, me); if (pInstance) { @@ -385,17 +385,17 @@ public: pVesperon->DisappearAndDie(); if (achievProgress == 1) - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); else if (achievProgress == 2) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); } else if (achievProgress == 3) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE, H_ACHIEV_TWILIGHT_ZONE)); } pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); @@ -404,7 +404,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me); + DoScriptText(RAND(SAY_SARTHARION_SLAY_1, SAY_SARTHARION_SLAY_2, SAY_SARTHARION_SLAY_3), me); } // me->ResetLootMode() is called from Reset() @@ -484,7 +484,7 @@ public: { if (pInstance) { - if (Creature *pTemp = Unit::GetCreature(*me,pInstance->GetData64(uiDataId))) + if (Creature *pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) { if (pTemp->isAlive() && !pTemp->getVictim()) { @@ -598,13 +598,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); @@ -612,8 +612,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; @@ -630,7 +630,7 @@ public: { DoScriptText(SAY_SARTHARION_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); - m_uiFlameBreathTimer = urand(25000,35000); + m_uiFlameBreathTimer = urand(25000, 35000); } else m_uiFlameBreathTimer -= uiDiff; @@ -639,7 +639,7 @@ public: if (m_uiTailSweepTimer <= uiDiff) { DoCast(me->getVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); - m_uiTailSweepTimer = urand(15000,20000); + m_uiTailSweepTimer = urand(15000, 20000); } else m_uiTailSweepTimer -= uiDiff; @@ -648,7 +648,7 @@ public: if (m_uiCleaveTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CLEAVE); - m_uiCleaveTimer = urand(7000,10000); + m_uiCleaveTimer = urand(7000, 10000); } else m_uiCleaveTimer -= uiDiff; @@ -660,10 +660,10 @@ public: { CastLavaStrikeOnTarget(pTarget); - if(urand(0,5) == 0) - DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1,SAY_SARTHARION_SPECIAL_2,SAY_SARTHARION_SPECIAL_3), me); + 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)); + m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); } else m_uiLavaStrikeTimer -= uiDiff; @@ -847,7 +847,7 @@ struct dummy_dragonAI : public ScriptedAI //using a grid search here seem to be more efficient than caching all four guids //in instance script and calculate range to each. - GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL,50.0f); + GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); switch(me->GetEntry()) { @@ -857,12 +857,12 @@ struct dummy_dragonAI : public ScriptedAI if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for(uint32 i = 0; i < 6; ++i) - me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + 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) - me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; } @@ -881,7 +881,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); @@ -890,7 +890,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); @@ -1034,7 +1034,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me); + DoScriptText(RAND(SAY_TENEBRON_SLAY_1, SAY_TENEBRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1052,7 +1052,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1071,7 +1071,7 @@ public: { DoScriptText(SAY_TENEBRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1123,14 +1123,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SHADRON_AGGRO,me); + DoScriptText(SAY_SHADRON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_SHADRON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me); + DoScriptText(RAND(SAY_SHADRON_SLAY_1, SAY_SHADRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1148,7 +1148,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1165,7 +1165,7 @@ public: OpenPortal(); m_bHasPortalOpen = true; - m_uiAcolyteShadronTimer = urand(60000,65000); + m_uiAcolyteShadronTimer = urand(60000, 65000); } } else @@ -1176,7 +1176,7 @@ public: { DoScriptText(SAY_SHADRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1222,14 +1222,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_VESPERON_AGGRO,me); + DoScriptText(SAY_VESPERON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_VESPERON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me); + DoScriptText(RAND(SAY_VESPERON_SLAY_1, SAY_VESPERON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1247,7 +1247,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1261,7 +1261,7 @@ public: { OpenPortal(); DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); - m_uiAcolyteVesperonTimer = urand(60000,70000); + m_uiAcolyteVesperonTimer = urand(60000, 70000); } } else @@ -1272,7 +1272,7 @@ public: { DoScriptText(SAY_VESPERON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1328,7 +1328,7 @@ public: } } - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } void JustDied(Unit* /*killer*/) @@ -1338,7 +1338,7 @@ public: Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); if(Shadron) { - (CAST_AI(mob_shadron::mob_shadronAI,Shadron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } Creature* pDebuffTarget = NULL; @@ -1352,10 +1352,10 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } @@ -1422,7 +1422,7 @@ public: uiDespawnTimer = 28000; if (pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } @@ -1436,7 +1436,7 @@ public: { Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON)); if (pVesperon) - (CAST_AI(mob_vesperon::mob_vesperonAI,pVesperon->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); @@ -1451,14 +1451,14 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->getVictim()) i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } @@ -1518,7 +1518,7 @@ public: { if(pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } m_uiFadeArmorTimer = 1000; m_uiHatchEggTimer = 20000; @@ -1546,7 +1546,7 @@ public: { Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); if(Tenebron) - (CAST_AI(mob_tenebron::mob_tenebronAI,Tenebron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } else @@ -1598,13 +1598,13 @@ public: { if (Tsunami_Timer <= diff) { - DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA); + DoCast(me, SPELL_FLAME_TSUNAMI_DMG_AURA); Tsunami_Timer = 500; }else Tsunami_Timer -= diff; if(TsunamiBuff_timer <= diff) { - if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true)) + if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); TsunamiBuff_timer = 1000; }else TsunamiBuff_timer -= diff; @@ -1699,7 +1699,7 @@ public: if (m_uiFadeArmorTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_FADE_ARMOR); - m_uiFadeArmorTimer = urand(5000,10000); + m_uiFadeArmorTimer = urand(5000, 10000); } else m_uiFadeArmorTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index f2d972bb051..54cdc46245b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -180,7 +180,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*pKiller*/) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9b9d7a38489..3a14946dfc0 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -109,7 +109,7 @@ public: uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); - uiDisperseHealth = 45 + urand(0,10); + uiDisperseHealth = 45 + urand(0, 10); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); @@ -140,7 +140,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void SpellHit(Unit* /*caster*/, const SpellEntry* spell) @@ -197,7 +197,7 @@ public: { lSparkList.Summon(pSummoned); - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true); + pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) @@ -278,7 +278,7 @@ public: { bHasDispersed = true; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 1b314ee3c9d..011c4c589b5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -125,7 +125,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void UpdateAI(const uint32 uiDiff) @@ -190,7 +190,7 @@ public: if (m_uiLightningNova_Timer <= uiDiff) { - DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), me); + DoScriptText(RAND(SAY_NOVA_1, SAY_NOVA_2, SAY_NOVA_3), me); DoScriptText(EMOTE_NOVA, me); DoCast(me, SPELL_LIGHTNING_NOVA_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1161ffac5eb..700df86881f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -172,7 +172,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void DespawnGolem() @@ -263,7 +263,7 @@ public: if (m_uiShatteringStomp_Timer <= uiDiff) { // Should he stomp even if he has no brittle golem to shatter? - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2), me); DoCast(me, SPELL_SHATTERING_STOMP_N); @@ -297,7 +297,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoScriptText(RAND(SAY_FORGE_1,SAY_FORGE_2), me); + DoScriptText(RAND(SAY_FORGE_1, SAY_FORGE_2), me); m_bHasTemper = true; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 5468837a711..7cf99900672 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -170,7 +170,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index f286dd23f58..92ec5db126e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -186,7 +186,7 @@ public: { uint32 uiSummonPipe = rand()%2; me->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : - RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), + RAND(CREATURE_FORGED_IRON_DWARF, CREATURE_FORGED_IRON_TROGG), PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); uiSummonTimer = 20000; @@ -231,7 +231,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void KilledIronSludge() 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 9fc0cc599d9..f237871ef90 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -174,10 +174,10 @@ public: if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } KaddrakGUIDList.clear(); @@ -369,7 +369,7 @@ public: case 17: DoScriptText(SAY_EVENT_INTRO_2, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); SetEscortPaused(true); JumpToNextStep(8500); @@ -386,7 +386,7 @@ public: { case 1: { - uint32 uiSpawnNumber = DUNGEON_MODE(2,3); + uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); @@ -470,7 +470,7 @@ public: case 8: DoScriptText(SAY_EVENT_A_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); @@ -494,7 +494,7 @@ public: case 12: DoScriptText(SAY_EVENT_B_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; JumpToNextStep(10000); @@ -526,7 +526,7 @@ public: case 18: DoScriptText(SAY_EVENT_C_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); @@ -580,7 +580,7 @@ public: DoScriptText(SAY_EVENT_END_01, me); me->SetStandState(UNIT_STAND_STATE_STAND); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); bIsBattle = true; @@ -703,10 +703,10 @@ public: { if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } Player* pPlayer = GetPlayerForEscort(); if (pPlayer) 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 afeb8a23e88..e28d082062f 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 @@ -144,7 +144,7 @@ public: case GO_TRIBUNAL_CHEST_HERO: uiTribunalChest = go->GetGUID(); if (m_auiEncounter[2] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; case 191527: uiTribunalSkyFloor = go->GetGUID(); @@ -159,12 +159,12 @@ public: case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; if (m_auiEncounter[1] == DONE) - HandleGameObject(uiBrannDoor,true); + HandleGameObject(uiBrannDoor, true); break; case DATA_KRYSTALLUS_EVENT: m_auiEncounter[0] = data; if (m_auiEncounter[0] == DONE) - HandleGameObject(uiMaidenOfGriefDoor,true); + HandleGameObject(uiMaidenOfGriefDoor, true); break; case DATA_SJONNIR_EVENT: m_auiEncounter[3] = data; @@ -173,10 +173,10 @@ public: m_auiEncounter[2] = data; if (m_auiEncounter[2] == DONE) { - HandleGameObject(uiSjonnirDoor,true); + HandleGameObject(uiSjonnirDoor, true); GameObject* go = instance->GetGameObject(uiTribunalChest); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); } break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 608685830ab..854624727db 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -127,7 +127,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void Reset() @@ -187,8 +187,8 @@ public: void SummonCollapsingStar(Unit* target) { DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); + me->SummonCreature(CREATURE_COLLAPSING_STAR, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 100000); + me->SummonCreature(CREATURE_BLACK_HOLE, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } void UpdateAI(const uint32 diff) @@ -205,7 +205,7 @@ public: if (HealthBelowPct(2)) { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f,417.321381f,0,0,0,0,0,0); + me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f, 417.321381f, 0, 0, 0, 0, 0, 0); // All of them. or random? DoScriptText(SAY_DEATH_1, me); @@ -259,36 +259,36 @@ public: if (QuantumStrike_Timer <= diff) { - DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE,H_SPELL_QUANTUM_STRIKE), true); + DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE, H_SPELL_QUANTUM_STRIKE), true); QuantumStrike_Timer = urand(4000, 14000); } else QuantumStrike_Timer -= diff; if (BigBang_Timer <= diff) { - DoScriptText(RAND(SAY_BIG_BANG_1,SAY_BIG_BANG_2), me); - DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG,H_SPELL_BIG_BANG), true); + DoScriptText(RAND(SAY_BIG_BANG_1, SAY_BIG_BANG_2), me); + DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG, H_SPELL_BIG_BANG), true); BigBang_Timer = 90000; } else BigBang_Timer -= diff; if (Ascend_Timer <= diff) { - DoCast(me->getVictim(),SPELL_ASCEND, true); + DoCast(me->getVictim(), SPELL_ASCEND, true); Ascend_Timer = 480000; } else Ascend_Timer -= diff; if (PhasePunch_Timer <= diff) { - DoCast(me->getVictim(),SPELL_PHASE_PUNCH, true); + DoCast(me->getVictim(), SPELL_PHASE_PUNCH, true); PhasePunch_Timer = 8000; } else PhasePunch_Timer -= diff; if (CosmicSmash_Timer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH,H_SPELL_COSMIC_SMASH), true); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH, H_SPELL_COSMIC_SMASH), true); CosmicSmash_Timer = urand(30000, 60000); } else CosmicSmash_Timer -= diff; @@ -296,7 +296,7 @@ public: if (Berserk_Timer <= diff) { DoScriptText(SAY_BERSERK, me); - DoCast(me->getVictim(),SPELL_BERSERK, true); + DoCast(me->getVictim(), SPELL_BERSERK, true); Berserk_Timer = 360000; } else Berserk_Timer -= diff; @@ -314,7 +314,7 @@ public: { DoCast(me, SPELL_ASCEND); DoScriptText(SAY_BERSERK, me); - Ascend_Timer = urand(360000,365000); + Ascend_Timer = urand(360000, 365000); Enrage = false; } else Ascend_Timer -= diff; } 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 6b63563d73c..ddf6858ff6d 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 @@ -281,14 +281,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1,SAY_STEELBREAKER_DEATH_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1,SAY_STEELBREAKER_SLAY_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); if (phase == 3) DoCast(me, SPELL_ELECTRICAL_CHARGE); @@ -392,7 +392,7 @@ public: if (phase >= 2) events.RescheduleEvent(EVENT_RUNE_OF_DEATH, 30000); if (phase >= 3) - events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -428,14 +428,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_MOLGEIM_DEATH_1,SAY_MOLGEIM_DEATH_2), me); + DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_MOLGEIM_SLAY_1,SAY_MOLGEIM_SLAY_2), me); + DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -470,19 +470,19 @@ public: } case EVENT_SHIELD_OF_RUNES: DoCast(me, RAID_MODE(SPELL_SHIELD_OF_RUNES, SPELL_SHIELD_OF_RUNES_H)); - events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000,34000)); + events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000)); break; case EVENT_RUNE_OF_DEATH: DoScriptText(SAY_MOLGEIM_RUNE_DEATH, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_DEATH); - events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000,40000)); + events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000, 40000)); break; case EVENT_RUNE_OF_SUMMONING: DoScriptText(SAY_MOLGEIM_SUMMON, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_SUMMONING); - events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -628,14 +628,14 @@ public: { case EVENT_UPDATEPHASE: events.SetPhase(++phase); - events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); - events.RescheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); + events.RescheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); if (phase >= 2) - events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); if (phase >= 3) { DoCast(me, SPELL_STORMSHIELD); - events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000,80000)); + events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000, 80000)); } break; @@ -673,14 +673,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_BRUNDIR_DEATH_1,SAY_BRUNDIR_DEATH_2), me); + DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_BRUNDIR_SLAY_1,SAY_BRUNDIR_SLAY_2), me); + DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -705,17 +705,17 @@ public: DoCast(SPELL_BERSERK); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_CHAIN_LIGHTNING_N , SPELL_CHAIN_LIGHTNING_H)); - events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); + events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); break; case EVENT_OVERLOAD: DoCast(RAID_MODE(SPELL_OVERLOAD , SPELL_OVERLOAD_H)); - events.ScheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); break; case EVENT_LIGHTNING_WHIRL: DoCast(RAID_MODE(SPELL_LIGHTNING_WHIRL , SPELL_LIGHTNING_WHIRL_H)); - events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); break; case EVENT_LIGHTNING_TENDRILS: DoCast(RAID_MODE(SPELL_LIGHTNING_TENDRILS, SPELL_LIGHTNING_TENDRILS_H)); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 0485e22b9ae..cee7b17ec64 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -62,12 +62,12 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) 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 352af769f59..d6f582e7b37 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -182,29 +182,29 @@ Position const Center[]= Position const PosSiege[5] = { - {-814.59f,-64.54f,429.92f,5.969f}, - {-784.37f,-33.31f,429.92f,5.096f}, - {-808.99f,-52.10f,429.92f,5.668f}, - {-798.59f,-44.00f,429.92f,5.663f}, - {-812.83f,-77.71f,429.92f,0.046f}, + {-814.59f, -64.54f, 429.92f, 5.969f}, + {-784.37f, -33.31f, 429.92f, 5.096f}, + {-808.99f, -52.10f, 429.92f, 5.668f}, + {-798.59f, -44.00f, 429.92f, 5.663f}, + {-812.83f, -77.71f, 429.92f, 0.046f}, }; Position const PosChopper[5] = { - {-717.83f,-106.56f,430.02f,0.122f}, - {-717.83f,-114.23f,430.44f,0.122f}, - {-717.83f,-109.70f,430.22f,0.122f}, - {-718.45f,-118.24f,430.26f,0.052f}, - {-718.45f,-123.58f,430.41f,0.085f}, + {-717.83f, -106.56f, 430.02f, 0.122f}, + {-717.83f, -114.23f, 430.44f, 0.122f}, + {-717.83f, -109.70f, 430.22f, 0.122f}, + {-718.45f, -118.24f, 430.26f, 0.052f}, + {-718.45f, -123.58f, 430.41f, 0.085f}, }; Position const PosDemolisher[5] = { - {-724.12f,-176.64f,430.03f,2.543f}, - {-766.70f,-225.03f,430.50f,1.710f}, - {-729.54f,-186.26f,430.12f,1.902f}, - {-756.01f,-219.23f,430.50f,2.369f}, - {-798.01f,-227.24f,429.84f,1.446f}, + {-724.12f, -176.64f, 430.03f, 2.543f}, + {-766.70f, -225.03f, 430.50f, 1.710f}, + {-729.54f, -186.26f, 430.12f, 1.902f}, + {-756.01f, -219.23f, 430.50f, 2.369f}, + {-798.01f, -227.24f, 429.84f, 1.446f}, }; class boss_flame_leviathan : public CreatureScript @@ -284,7 +284,7 @@ class boss_flame_leviathan : public CreatureScript if (towerOfFlames) { me->AddAura(SPELL_BUFF_TOWER_OF_FLAMES, me); - events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO,70*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, 70*IN_MILLISECONDS); } if (towerOfFrost) @@ -376,7 +376,7 @@ class boss_flame_leviathan : public CreatureScript events.Update(diff); - if (Shutdown == RAID_MODE(2,4)) + if (Shutdown == RAID_MODE(2, 4)) { Shutdown = 0; events.ScheduleEvent(EVENT_SHUTDOWN, 4000); @@ -411,7 +411,7 @@ class boss_flame_leviathan : public CreatureScript break; // this is a must case EVENT_PURSUE: DoScriptText(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3), me); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,75,true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 75, true)) { me->AddAura(SPELL_PURSUED, target); me->MonsterTextEmote(EMOTE_PURSUE, target->GetGUID(), true); @@ -454,7 +454,7 @@ class boss_flame_leviathan : public CreatureScript case EVENT_THORIM_S_HAMMER: // Tower of Storms for (uint8 i = 0; i < 7; ++i) { - if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20,60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) + if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20, 60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) thorim->GetMotionMaster()->MoveRandom(100); } DoScriptText(SAY_TOWER_STORM, me); @@ -661,7 +661,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) if(CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); @@ -763,7 +763,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript void JustDied(Unit* /*killer*/) { - float x,y,z; + float x, y, z; me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z); @@ -1020,7 +1020,7 @@ class npc_hodirs_fury : public CreatureScript void MoveInLineOfSight(Unit* who) { - if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who,0,5,false)) + if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 5, false)) { if (Creature* trigger = DoSummonFlyer(NPC_HODIR_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN)) trigger->CastSpell(who, SPELL_HODIR_S_FURY, true); @@ -1170,9 +1170,9 @@ class npc_lorekeeper : public CreatureScript if (player) { player->PrepareGossipMenu(creature); - instance->instance->LoadGrid(364,-16); //make sure leviathan is loaded + instance->instance->LoadGrid(364, -16); //make sure leviathan is loaded - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } break; @@ -1207,7 +1207,7 @@ class npc_lorekeeper : public CreatureScript { player->PrepareGossipMenu(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(player->GetGossipTextId(creature), creature->GetGUID()); } return true; @@ -1240,7 +1240,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // break; @@ -1260,7 +1260,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // return true; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 0076ed9f55f..817fcfcd4cc 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -87,7 +87,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index c27625fcf60..ed8fe571241 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -158,7 +158,7 @@ public: However, if there are not at least 9 people outside of 15 yards he will start casting it on players inside 15 yards melee and tank included. */ - Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4,9), 15.0f, 50.f); + Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4, 9), 15.0f, 50.f); if (!target) target = SelectTarget(SELECT_TARGET_RANDOM); DoCast(target, SPELL_MARK_OF_THE_FACELESS); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 382b88be6c8..293d6fd3bdf 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -54,7 +54,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 6fc96c8dd7f..ba0e77cbee3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -86,26 +86,26 @@ enum eAchievementData const Position Pos[20] = { - {630.366f,216.772f,360.891f,3.001970f}, - {630.594f,231.846f,360.891f,3.124140f}, - {630.435f,337.246f,360.886f,3.211410f}, - {630.493f,313.349f,360.886f,3.054330f}, - {630.444f,321.406f,360.886f,3.124140f}, - {630.366f,247.307f,360.888f,3.211410f}, - {630.698f,305.311f,360.886f,3.001970f}, - {630.500f,224.559f,360.891f,3.054330f}, - {630.668f,239.840f,360.890f,3.159050f}, - {630.384f,329.585f,360.886f,3.159050f}, - {543.220f,313.451f,360.886f,0.104720f}, - {543.356f,329.408f,360.886f,6.248280f}, - {543.076f,247.458f,360.888f,6.213370f}, - {543.117f,232.082f,360.891f,0.069813f}, - {543.161f,305.956f,360.886f,0.157080f}, - {543.277f,321.482f,360.886f,0.052360f}, - {543.316f,337.468f,360.886f,6.195920f}, - {543.280f,239.674f,360.890f,6.265730f}, - {543.265f,217.147f,360.891f,0.174533f}, - {543.256f,224.831f,360.891f,0.122173f} + {630.366f, 216.772f, 360.891f, 3.001970f}, + {630.594f, 231.846f, 360.891f, 3.124140f}, + {630.435f, 337.246f, 360.886f, 3.211410f}, + {630.493f, 313.349f, 360.886f, 3.054330f}, + {630.444f, 321.406f, 360.886f, 3.124140f}, + {630.366f, 247.307f, 360.888f, 3.211410f}, + {630.698f, 305.311f, 360.886f, 3.001970f}, + {630.500f, 224.559f, 360.891f, 3.054330f}, + {630.668f, 239.840f, 360.890f, 3.159050f}, + {630.384f, 329.585f, 360.886f, 3.159050f}, + {543.220f, 313.451f, 360.886f, 0.104720f}, + {543.356f, 329.408f, 360.886f, 6.248280f}, + {543.076f, 247.458f, 360.888f, 6.213370f}, + {543.117f, 232.082f, 360.891f, 0.069813f}, + {543.161f, 305.956f, 360.886f, 0.157080f}, + {543.277f, 321.482f, 360.886f, 0.052360f}, + {543.316f, 337.468f, 360.886f, 6.195920f}, + {543.280f, 239.674f, 360.890f, 6.265730f}, + {543.265f, 217.147f, 360.891f, 0.174533f}, + {543.256f, 224.831f, 360.891f, 0.122173f} }; class boss_ignis : public CreatureScript @@ -169,10 +169,10 @@ public: { // Shattered if (Shattered) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10,ACHIEVEMENT_SHATTERED_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10, ACHIEVEMENT_SHATTERED_25)); // Stokin' the Furnace if (EncounterTime <= MAX_ENCOUNTER_TIME) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10,ACHIEVEMENT_STOKIN_THE_FURNACE_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10, ACHIEVEMENT_STOKIN_THE_FURNACE_25)); } } @@ -196,7 +196,7 @@ public: case EVENT_JET: me->MonsterTextEmote(EMOTE_JETS, 0, true); DoCastAOE(SPELL_FLAME_JETS); - events.RescheduleEvent(EVENT_JET,urand(35000,40000)); + events.RescheduleEvent(EVENT_JET, urand(35000, 40000)); break; case EVENT_SLAG_POT: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -207,7 +207,7 @@ public: events.DelayEvents(3000); events.ScheduleEvent(EVENT_GRAB_POT, 500); } - events.RescheduleEvent(EVENT_SLAG_POT,RAID_MODE(30000, 15000)); + events.RescheduleEvent(EVENT_SLAG_POT, RAID_MODE(30000, 15000)); break; case EVENT_GRAB_POT: if (Unit* SlagPotTarget = Unit::GetUnit(*me, SlagPotGUID)) @@ -240,14 +240,14 @@ public: if (Unit *pTarget = me->getVictim()) me->SummonCreature(NPC_GROUND_SCORCH, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); - events.RescheduleEvent(EVENT_SCORCH,25000); + events.RescheduleEvent(EVENT_SCORCH, 25000); break; case EVENT_CONSTRUCT: DoScriptText(SAY_SUMMON, me); DoSummon(NPC_IRON_CONSTRUCT, Pos[rand()%20], 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); DoCast(SPELL_STRENGHT); DoCast(me, SPELL_ACTIVATE_CONSTRUCT); - events.RescheduleEvent(EVENT_CONSTRUCT,RAID_MODE(40000, 30000)); + events.RescheduleEvent(EVENT_CONSTRUCT, RAID_MODE(40000, 30000)); break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); @@ -409,10 +409,10 @@ public: { 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); + me->AddAura(SPELL_HEAT, Construct); HeatTimer=1000; } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index a8f4d237306..ae416693f7d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -26,13 +26,13 @@ SDComment: TODO: Achievements SDCategory: Ulduar EndScriptData */ -#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629,63979) -#define SPELL_TWO_ARM_SMASH RAID_MODE(63356,64003) -#define SPELL_ONE_ARM_SMASH RAID_MODE(63573,64006) -#define SPELL_ARM_SWEEP RAID_MODE(63766,63983) -#define SPELL_STONE_SHOUT RAID_MODE(63716,64005) -#define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980) -#define SPELL_STONE_GRIP RAID_MODE(62166,63981) +#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629, 63979) +#define SPELL_TWO_ARM_SMASH RAID_MODE(63356, 64003) +#define SPELL_ONE_ARM_SMASH RAID_MODE(63573, 64006) +#define SPELL_ARM_SWEEP RAID_MODE(63766, 63983) +#define SPELL_STONE_SHOUT RAID_MODE(63716, 64005) +#define SPELL_PETRIFY_BREATH RAID_MODE(62030, 63980) +#define SPELL_STONE_GRIP RAID_MODE(62166, 63981) #define SPELL_STONE_GRIP_CANCEL 65594 #define SPELL_SUMMON_RUBBLE 63633 #define SPELL_FALLING_RUBBLE 63821 @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_ARM_ENTER_VISUAL 64753 #define SPELL_SUMMON_FOCUSED_EYEBEAM 63342 -#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347,63977) +#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347, 63977) #define SPELL_FOCUSED_EYEBEAM_VISUAL 63369 #define SPELL_FOCUSED_EYEBEAM_VISUAL_LEFT 63676 #define SPELL_FOCUSED_EYEBEAM_VISUAL_RIGHT 63702 @@ -153,7 +153,7 @@ class boss_kologarn : public CreatureScript void KilledUnit(Unit* /*who*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 9e0b6ff5a35..d3e31eebbf1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -218,7 +218,7 @@ class boss_razorscale_controller : public CreatureScript events.ScheduleEvent(EVENT_BUILD_HARPOON_3, 90000); break; case ACTION_PLACE_BROKEN_HARPOON: - for (uint8 n = 0; n < RAID_MODE(2,4); n++) + for (uint8 n = 0; n < RAID_MODE(2, 4); n++) me->SummonGameObject(GO_RAZOR_BROKEN_HARPOON, PosHarpoon[n].GetPositionX(), PosHarpoon[n].GetPositionY(), PosHarpoon[n].GetPositionZ(), 2.286f, 0, 0, 0, 0, 180000); break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index a99927d5e50..fe66401a669 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -69,7 +69,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) @@ -80,7 +80,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); _EnterCombat(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 2af069977b0..96d7168f468 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -274,7 +274,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit * /*victim*/) @@ -314,7 +314,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); uiGravityBombTarget = pTarget->GetGUID(); } uiGravityBombTimer = TIMER_GRAVITY_BOMB; @@ -425,7 +425,7 @@ public: { if (Unit *pGravityBombTarget = me->GetUnit(*me, uiGravityBombTarget)) { - pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); if (hardMode) { //Remains spawned for 3 minutes 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 a32c68fdf3b..8977e4860b6 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 @@ -139,7 +139,7 @@ public: bEventInProgress = true; bIsUndead = true; - DoScriptText(YELL_DEAD_1,me); + DoScriptText(YELL_DEAD_1, me); } if (bEventInProgress) @@ -157,12 +157,12 @@ public: me->SetInCombatWith(me->getVictim()); me->GetMotionMaster()->MoveChase(me->getVictim()); - DoScriptText(YELL_AGGRO_2,me); + DoScriptText(YELL_AGGRO_2, me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(YELL_AGGRO_1,me); + DoScriptText(YELL_AGGRO_1, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); @@ -170,7 +170,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(YELL_DEAD_2,me); + DoScriptText(YELL_DEAD_2, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, DONE); @@ -179,9 +179,9 @@ public: void KilledUnit(Unit * /*victim*/) { if (bIsUndead) - DoScriptText(YELL_KILL_1,me); + DoScriptText(YELL_KILL_1, me); else - DoScriptText(YELL_KILL_2,me); + DoScriptText(YELL_KILL_2, me); } void UpdateAI(const uint32 diff) @@ -245,7 +245,7 @@ public: Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { - me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); DoCast(me, SPELL_SHADOW_AXE_SUMMON); } @@ -301,7 +301,7 @@ public: pInstance = c->GetInstanceScript(); } - float x,y,z; + float x, y, z; InstanceScript* pInstance; uint32 uiResurectTimer; uint32 uiResurectPhase; @@ -314,15 +314,15 @@ public: me->SetSpeed(MOVE_WALK , 1.0f); //me->SetSpeed(MOVE_FLIGHT , 1.0f); - me->GetPosition(x,y,z); - DoTeleportTo(x+1,y,z+30); + me->GetPosition(x, y, z); + DoTeleportTo(x+1, y, z+30); Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); if (ingvar) { - me->GetMotionMaster()->MovePoint(1,x,y,z+15); + me->GetMotionMaster()->MovePoint(1, x, y, z+15); - // DoScriptText(YELL_RESSURECT,me); + // DoScriptText(YELL_RESSURECT, me); } } @@ -337,14 +337,14 @@ public: { case 1: ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_DUMMY, true); DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); uiResurectTimer = 8000; uiResurectPhase = 1; break; case 2: me->SetVisible(false); - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); break; } @@ -366,7 +366,7 @@ public: if (ingvar) { ingvar->SetStandState(UNIT_STAND_STATE_STAND); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_HEAL, false); } uiResurectTimer = 3000; uiResurectPhase = 2; @@ -380,7 +380,7 @@ public: if (boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI* pAI = CAST_AI(boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI, ingvar->AI())) pAI->StartZombiePhase(); - me->GetMotionMaster()->MovePoint(2,x+1,y,z+30); + me->GetMotionMaster()->MovePoint(2, x+1, y, z+30); ++uiResurectPhase; uiResurectTimer = 0; } @@ -417,13 +417,13 @@ public: void Reset() { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET,50); + Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); if (pTarget) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); - float x,y,z; - pTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); + float x, y, z; + pTarget->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z); } uiDespawnTimer = 7000; } @@ -434,7 +434,7 @@ public: { if (uiDespawnTimer <= diff) { - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); uiDespawnTimer = 0; } else uiDespawnTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 1e874b3d5ee..096ee335077 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -96,7 +96,7 @@ public: if (FrostTombGUID) { - Unit* FrostTomb = Unit::GetUnit((*me),FrostTombGUID); + Unit* FrostTomb = Unit::GetUnit((*me), FrostTombGUID); if (FrostTomb) FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); } @@ -104,7 +104,7 @@ public: void UpdateAI(const uint32 /*diff*/) { - Unit* temp = Unit::GetUnit((*me),FrostTombGUID); + Unit* temp = Unit::GetUnit((*me), FrostTombGUID); if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -282,7 +282,7 @@ public: void Reset() { Respawn_Time = 12000; - Decrepify_Timer = urand(10000,20000); + Decrepify_Timer = urand(10000, 20000); isDead = false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index dd5fb2a6c82..6ff8e4d9ac8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -27,14 +27,14 @@ EndScriptData */ enum eEnums { - //signed for 24200, but used by 24200,27390 + //signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = -1574011, YELL_SKARVALD_DAL_DIED = -1574012, YELL_SKARVALD_SKA_DIEDFIRST = -1574013, YELL_SKARVALD_KILL = -1574014, YELL_SKARVALD_DAL_DIEDFIRST = -1574015, - //signed for 24201, but used by 24201,27389 + //signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = -1574016, YELL_DALRONN_SKA_DIED = -1574017, YELL_DALRONN_DAL_DIEDFIRST = -1574018, @@ -93,7 +93,7 @@ public: ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isDead()) CAST_CRE(dalronn)->Respawn(); @@ -105,11 +105,11 @@ public: { if (!ghost && pInstance) { - DoScriptText(YELL_SKARVALD_AGGRO,me); + DoScriptText(YELL_SKARVALD_AGGRO, me); - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) - dalronn->getThreatManager().addThreat(who,0.0f); + dalronn->getThreatManager().addThreat(who, 0.0f); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); } @@ -119,25 +119,25 @@ public: { if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn) { if (dalronn->isDead()) { - DoScriptText(YELL_SKARVALD_DAL_DIED,me); + DoScriptText(YELL_SKARVALD_DAL_DIED, me); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); - Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -149,7 +149,7 @@ public: { if (!ghost) { - DoScriptText(YELL_SKARVALD_KILL,me); + DoScriptText(YELL_SKARVALD_KILL, me); } } @@ -184,7 +184,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; @@ -250,7 +250,7 @@ public: ghost = me->GetEntry() == MOB_DALRONN_GHOST; if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isDead()) CAST_CRE(skarvald)->Respawn(); @@ -262,9 +262,9 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) - skarvald->getThreatManager().addThreat(who,0.0f); + skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; @@ -277,26 +277,26 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald) { if (skarvald->isDead()) { - DoScriptText(YELL_DALRONN_SKA_DIED,me); + DoScriptText(YELL_DALRONN_SKA_DIED, me); if (pInstance) pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_DAL_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); - Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -308,7 +308,7 @@ public: { if (!ghost) { - DoScriptText(YELL_DALRONN_KILL,me); + DoScriptText(YELL_DALRONN_KILL, me); } } @@ -327,7 +327,7 @@ public: { if (AggroYell_Timer <= diff) { - DoScriptText(YELL_DALRONN_AGGRO,me); + DoScriptText(YELL_DALRONN_AGGRO, me); AggroYell_Timer = 0; } else AggroYell_Timer -= diff; @@ -354,7 +354,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_SKA_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; } 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 92972d67469..443512d5986 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -139,27 +139,27 @@ public: { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; } } @@ -197,42 +197,42 @@ public: case EVENT_FORGE_1: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[0],false); - HandleGameObject(forge_fire[0],false); - HandleGameObject(forge_anvil[0],false); + HandleGameObject(forge_bellow[0], false); + HandleGameObject(forge_fire[0], false); + HandleGameObject(forge_anvil[0], false); }else { - HandleGameObject(forge_bellow[0],true); - HandleGameObject(forge_fire[0],true); - HandleGameObject(forge_anvil[0],true); + HandleGameObject(forge_bellow[0], true); + HandleGameObject(forge_fire[0], true); + HandleGameObject(forge_anvil[0], true); } forge_event[0] = data; break; case EVENT_FORGE_2: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[1],false); - HandleGameObject(forge_fire[1],false); - HandleGameObject(forge_anvil[1],false); + HandleGameObject(forge_bellow[1], false); + HandleGameObject(forge_fire[1], false); + HandleGameObject(forge_anvil[1], false); }else { - HandleGameObject(forge_bellow[1],true); - HandleGameObject(forge_fire[1],true); - HandleGameObject(forge_anvil[1],true); + HandleGameObject(forge_bellow[1], true); + HandleGameObject(forge_fire[1], true); + HandleGameObject(forge_anvil[1], true); } forge_event[1] = data; break; case EVENT_FORGE_3: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[2],false); - HandleGameObject(forge_fire[2],false); - HandleGameObject(forge_anvil[2],false); + HandleGameObject(forge_bellow[2], false); + HandleGameObject(forge_fire[2], false); + HandleGameObject(forge_anvil[2], false); }else { - HandleGameObject(forge_bellow[2],true); - HandleGameObject(forge_fire[2],true); - HandleGameObject(forge_anvil[2],true); + HandleGameObject(forge_bellow[2], true); + HandleGameObject(forge_fire[2], true); + HandleGameObject(forge_anvil[2], true); } forge_event[2] = data; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 5f3a93e0d57..0b9bd93e2ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -59,13 +59,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); break; } } @@ -79,13 +79,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,DONE); + pInstance->SetData(EVENT_FORGE_1, DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,DONE); + pInstance->SetData(EVENT_FORGE_2, DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,DONE); + pInstance->SetData(EVENT_FORGE_3, DONE); break; } } @@ -99,17 +99,17 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); break; case 2: - pInstance->SetData(EVENT_FORGE_2,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_2, IN_PROGRESS); break; case 3: - pInstance->SetData(EVENT_FORGE_3,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_3, IN_PROGRESS); break; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE ,EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() @@ -120,10 +120,10 @@ public: for (uint8 i = 0; i < 3 ; ++i) { GameObject* temp; - temp = me->FindNearestGameObject(entry_search[i],30); + temp = me->FindNearestGameObject(entry_search[i], 30); if (temp) { - if (me->IsWithinDist(temp,diff,false)) + if (me->IsWithinDist(temp, diff, false)) { near_f = i + 1; diff = me->GetDistance2d(temp); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 04d7a38b4c0..7f0d4dbed5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -64,12 +64,12 @@ struct Locations struct Locations moveLocs[]= { - {261.6f,-449.3f,109.5f}, - {263.3f,-454.0f,109.5f}, - {291.5f,-450.4f,109.5f}, - {291.5f,-454.0f,109.5f}, - {310.0f,-453.4f,109.5f}, - {238.6f,-460.7f,109.5f} + {261.6f, -449.3f, 109.5f}, + {263.3f, -454.0f, 109.5f}, + {291.5f, -450.4f, 109.5f}, + {291.5f, -454.0f, 109.5f}, + {310.0f, -453.4f, 109.5f}, + {238.6f, -460.7f, 109.5f} }; enum Phase @@ -190,20 +190,20 @@ public: if (uiArcingSmashTimer <= diff) { DoCast(me, SPELL_ARCING_SMASH); - uiArcingSmashTimer = urand(13000,17000); + uiArcingSmashTimer = urand(13000, 17000); } else uiArcingSmashTimer -= diff; if (uiImpaleTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_IMPALE); - uiImpaleTimer = urand(8000,12000); + uiImpaleTimer = urand(8000, 12000); } else uiImpaleTimer -= diff; if (uiWhiteringRoarTimer <= diff) { DoCast(me, SPELL_WITHERING_ROAR); - uiWhiteringRoarTimer = urand(8000,12000); + uiWhiteringRoarTimer = urand(8000, 12000); } else uiWhiteringRoarTimer -= diff; DoMeleeAttackIfReady(); @@ -726,7 +726,7 @@ public: { Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) - CAST_AI(boss_palehoof::boss_palehoofAI,pPalehoof->AI())->NextPhase(); + CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } } @@ -796,7 +796,7 @@ public: pNext->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_OOC_NOT_ATTACKABLE); pNext->SetStandState(UNIT_STAND_STATE_STAND); pNext->SetInCombatWithZone(); - pNext->Attack(pNext->SelectNearestTarget(100),true); + pNext->Attack(pNext->SelectNearestTarget(100), true); } currentPhase = PHASE_NONE; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index b2f98b11475..9da89393f02 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -356,7 +356,7 @@ public: break; case 3: me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); - DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); + DoScriptText(RAND(SAY_DRAKE_BREATH_1, SAY_DRAKE_BREATH_2), me); DoScriptText(EMOTE_BREATH, me); m_uiMovementTimer = 2500; break; @@ -417,14 +417,14 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void SpawnMobs() { - for (uint8 i = 0; i < DUNGEON_MODE(5,6); ++i) + for (uint8 i = 0; i < DUNGEON_MODE(5, 6); ++i) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; @@ -436,7 +436,7 @@ public: void SpawnTrigger() { uint8 iStart = 0, iEnd = 0; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: iStart = 8; @@ -466,9 +466,9 @@ public: InstanceScript* m_pInstance = pGO->GetInstanceScript(); if (!m_pInstance) return false; - if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) + if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) { - pPlayer->CastSpell(pSkadi,SPELL_RAPID_FIRE, true); + pPlayer->CastSpell(pSkadi, SPELL_RAPID_FIRE, true); } return false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c1970aaadb4..00cc67cd06f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -295,7 +295,7 @@ public: if (pInstance) { pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - pInstance->SetData64(DATA_SACRIFICED_PLAYER,0); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, 0); } } @@ -355,7 +355,7 @@ public: Phase = SACRIFICING; if (pInstance) { - pInstance->SetData64(DATA_SACRIFICED_PLAYER,pSacrificeTarget->GetGUID()); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); for (uint8 i = 0; i < 3; ++i) if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 16caa1adadb..3c04d522c4c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -83,7 +83,7 @@ struct ActiveBoatStruct { uint32 npc; int32 say; - float MoveX,MoveY,MoveZ,SpawnX,SpawnY,SpawnZ,SpawnO; + float MoveX, MoveY, MoveZ, SpawnX, SpawnY, SpawnZ, SpawnO; }; static ActiveBoatStruct ActiveBot[4] = @@ -291,7 +291,7 @@ public: if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) { - float x,y,z; + float x, y, z; x = me->GetPositionX()-5; y = me->GetPositionY()-5; z = me->GetPositionZ(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 7e7cdc01d22..f2c59b63e86 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -22,14 +22,14 @@ //Spells Archavon #define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960,60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663,60880) -#define SPELL_IMPALE RAID_MODE(58666,60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. +#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. +#define SPELL_STOMP RAID_MODE(58663, 60880) +#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. #define SPELL_BERSERK 47008 //Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919,60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897,60899) -#define SPELL_WHIRL RAID_MODE(60902,60916) +#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) +#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) +#define SPELL_WHIRL RAID_MODE(60902, 60916) //4 Warders spawned #define ARCHAVON_WARDER 32353 //npc 32353 @@ -47,7 +47,7 @@ enum Events EVENT_BERSERK = 5, // 300s cd //mob - EVENT_ROCK_SHOWER = 6, // set = 20s cd,unkown cd + EVENT_ROCK_SHOWER = 6, // set = 20s cd, unkown cd EVENT_SHIELD_CRUSH = 7, // set = 30s cd EVENT_WHIRL = 8, // set= 10s cd }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 31ca69c11c3..5ddd2f02a17 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -153,7 +153,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1e540c09220..c1f7aac1779 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -72,8 +72,8 @@ public: { uiBloodlustTimer = 15000; uiChainHealTimer = 0; - uiEarthShockTimer = urand(2000,8000); - uiLightningBoltTimer = urand(5000,10000); + uiEarthShockTimer = urand(2000, 8000); + uiLightningBoltTimer = urand(5000, 10000); uiEarthShieldTimer = 20000; if (pInstance) { @@ -187,20 +187,20 @@ public: if (uiBloodlustTimer <= diff) { DoCast(me, SPELL_BLOODLUST); - uiBloodlustTimer = urand(35000,45000); + uiBloodlustTimer = urand(35000, 45000); } else uiBloodlustTimer -= diff; if (uiEarthShockTimer <= diff) { DoCast(me->getVictim(), SPELL_EARTH_SHOCK); - uiEarthShockTimer = urand(8000,13000); + uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; if (uiLightningBoltTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); - uiLightningBoltTimer = urand(18000,24000); + uiLightningBoltTimer = urand(18000, 24000); } else uiLightningBoltTimer -= diff; DoMeleeAttackIfReady(); @@ -229,7 +229,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } uint64 GetChainHealTargetGUID() @@ -283,9 +283,9 @@ public: void Reset() { - uiStrikeTimer = urand(4000,8000); - uiHowlingScreechTimer = urand(8000,13000); - uiGushingWoundTimer = urand(1000,3000); + uiStrikeTimer = urand(4000, 8000); + uiHowlingScreechTimer = urand(8000, 13000); + uiGushingWoundTimer = urand(1000, 3000); } void AttackStart(Unit* pWho) @@ -314,19 +314,19 @@ public: if (uiStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_STRIKE); - uiStrikeTimer = urand(4000,8000); + uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { DoCast(me->getVictim(), SPELL_HOWLING_SCREECH); - uiHowlingScreechTimer = urand(8000,13000); + uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_GUSHING_WOUND); - uiGushingWoundTimer = urand(7000,12000); + uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b6db8eaf8f6..b82996bfc89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -307,7 +307,7 @@ public: pSummoned->SetSpeed(MOVE_RUN, 0.3f); pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0); m_waterElements.push_back(pSummoned->GetGUID()); - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } } @@ -316,7 +316,7 @@ public: if (pSummoned) { m_waterElements.remove(pSummoned->GetGUID()); - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } } @@ -324,7 +324,7 @@ public: { if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; @@ -354,7 +354,7 @@ public: void Reset() { uiRangeCheck_Timer = 1000; - DoCast(me,SPELL_WATER_GLOBULE); + DoCast(me, SPELL_WATER_GLOBULE); } void AttackStart(Unit* /*pWho*/) diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 65de6aef578..67153a0cf81 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { DoCast(me->getVictim(), SPELL_FIREBOLT); - uiFireboltTimer = urand(5000,13000); + uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { DoCast(me->getVictim(), SPELL_FLAME_BREATH); - uiFlameBreathTimer = urand(10000,15000); + uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { DoCast(me->getVictim(), SPELL_LAVA_BURN); - uiLavaBurnTimer = urand(15000,23000); + uiLavaBurnTimer = urand(15000, 23000); } if (IsHeroic()) @@ -130,7 +130,7 @@ public: if (uiCauterizingFlamesTimer <= diff) { DoCast(me->getVictim(), SPELL_CAUTERIZING_FLAMES); - uiCauterizingFlamesTimer = urand(10000,16000); + uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 2ef3a9b6df6..e2893a5445b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -127,7 +127,7 @@ public: else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) { pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT,13); + pInstance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 19aea5f8769..bfaf971abce 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; @@ -218,7 +218,7 @@ public: if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 9ed5d005321..9b6cb6c2964 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -171,14 +171,14 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustSummoned(Creature* summon) { summon->AI()->AttackStart(me->getVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); - summon->SetPhaseMask(17,true); + summon->SetPhaseMask(17, true); } }; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c21d1b491d1..93ef8256fef 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -200,7 +200,7 @@ public: uiDoorIntegrity = 100; uiWaveCount = 0; - uiLocation = urand(0,5); + uiLocation = urand(0, 5); uiFirstBoss = 0; uiSecondBoss = 0; uiCountErekemGuards = 0; @@ -469,9 +469,9 @@ public: void SpawnPortal() { - SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1,5))%6); + 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(); } @@ -482,7 +482,7 @@ public: switch(uiBoss) { case BOSS_MORAGG: - HandleGameObject(uiMoraggCell,bForceRespawn); + HandleGameObject(uiMoraggCell, bForceRespawn); pBoss = instance->GetCreature(uiMoragg); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove1); @@ -516,25 +516,25 @@ public: } break; case BOSS_ICHORON: - HandleGameObject(uiIchoronCell,bForceRespawn); + HandleGameObject(uiIchoronCell, bForceRespawn); pBoss = instance->GetCreature(uiIchoron); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove3); break; case BOSS_LAVANTHOR: - HandleGameObject(uiLavanthorCell,bForceRespawn); + HandleGameObject(uiLavanthorCell, bForceRespawn); pBoss = instance->GetCreature(uiLavanthor); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove4); break; case BOSS_XEVOZZ: - HandleGameObject(uiXevozzCell,bForceRespawn); + HandleGameObject(uiXevozzCell, bForceRespawn); pBoss = instance->GetCreature(uiXevozz); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove5); break; case BOSS_ZURAMAT: - HandleGameObject(uiZuramatCell,bForceRespawn); + HandleGameObject(uiZuramatCell, bForceRespawn); pBoss = instance->GetCreature(uiZuramat); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove6); @@ -570,7 +570,7 @@ public: { case 6: if (uiFirstBoss == 0) - uiFirstBoss = urand(1,6); + uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) @@ -583,7 +583,7 @@ public: if (uiSecondBoss == 0) do { - uiSecondBoss = urand(1,6); + uiSecondBoss = urand(1, 6); } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { @@ -597,7 +597,7 @@ public: { Creature* pSinclari = instance->GetCreature(uiSinclari); if (pSinclari) - pSinclari->SummonCreature(CREATURE_CYANIGOSA,CyanigosasSpawnLocation,TEMPSUMMON_DEAD_DESPAWN); + pSinclari->SummonCreature(CREATURE_CYANIGOSA, CyanigosasSpawnLocation, TEMPSUMMON_DEAD_DESPAWN); break; } case 1: @@ -701,7 +701,7 @@ public: StartBossEncounter(uiFirstBoss, false); StartBossEncounter(uiSecondBoss, false); - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); SetData(DATA_WAVE_COUNT, 0); uiMainEventPhase = NOT_STARTED; @@ -719,12 +719,12 @@ public: { pGuard->SetVisible(true); pGuard->SetReactState(REACT_AGGRESSIVE); - pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition()); + pGuard->GetMotionMaster()->MovePoint(1, pGuard->GetHomePosition()); } } } - pSinclari->GetMotionMaster()->MovePoint(1,pSinclari->GetHomePosition()); - pSinclari->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + pSinclari->GetMotionMaster()->MovePoint(1, pSinclari->GetHomePosition()); + pSinclari->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } @@ -771,14 +771,14 @@ public: { if(uiDoorSpellTimer < diff) { - SetData(DATA_DOOR_INTEGRITY,GetData(DATA_DOOR_INTEGRITY)-1); + SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; } else uiDoorSpellTimer -= diff; } // else set door state to active (means door will open and group have failed to sustain mob invasion on the door) else { - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); uiMainEventPhase = FAIL; } } @@ -792,7 +792,7 @@ public: { Creature* creature = instance->GetCreature(*itr); if (creature && creature->isAlive()) - creature->CastSpell(creature,SPELL_ARCANE_LIGHTNING,true); // Who should cast the spell? + creature->CastSpell(creature, SPELL_ARCANE_LIGHTNING, true); // Who should cast the spell? } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index cd6a0c66641..e03c69f4672 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -262,13 +262,13 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_sinclari_vh::npc_sinclariAI, (pCreature->AI()))->uiPhase = 1; if (InstanceScript *pInstance = pCreature->GetInstanceScript()) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(),playerTeleportPosition.GetPositionY(),playerTeleportPosition.GetPositionZ(),playerTeleportPosition.GetOrientation(),true); + pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -283,12 +283,12 @@ public: { case NOT_STARTED: case FAIL: // Allow to start event if not started or wiped - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; case IN_PROGRESS: // Allow to teleport inside if event is in progress - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_I_WANT_IN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+3); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; default: @@ -395,7 +395,7 @@ public: break; case 5: if (pInstance) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,IN_PROGRESS); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS); me->SetReactState(REACT_PASSIVE); uiTimer = 0; uiPhase = 0; @@ -492,36 +492,36 @@ public: { case 1: 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); + 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++) - 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); + 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++) - 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); + 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; case 4: - AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0); - me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108f); + AddWaypoint(0, SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 0); + me->SetHomePosition(SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 3.991108f); break; case 5: - AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0); - me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841f); + AddWaypoint(0, SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 0); + me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: 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); + 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; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } @@ -529,7 +529,7 @@ public: { me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false); me->DisappearAndDie(); - Creature* pSaboPort = Unit::GetCreature((*me),pInstance->GetData64(DATA_SABOTEUR_PORTAL)); + Creature* pSaboPort = Unit::GetCreature((*me), pInstance->GetData64(DATA_SABOTEUR_PORTAL)); if (pSaboPort) pSaboPort->DisappearAndDie(); pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1); @@ -553,7 +553,7 @@ public: npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me) { pInstance = c->GetInstanceScript(); - uiTypeOfMobsPortal = urand(0,1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs + uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs bPortalGuardianOrKeeperOrEliteSpawn = false; } @@ -602,7 +602,7 @@ public: uint8 k = uiWaveCount < 12 ? 2 : 3; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR); + uint32 entry = RAND(CREATURE_AZURE_CAPTAIN, CREATURE_AZURE_RAIDER, CREATURE_AZURE_STALKER, CREATURE_AZURE_SORCEROR); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } me->SetVisible(false); @@ -627,7 +627,7 @@ public: uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_INVADER_1,CREATURE_AZURE_INVADER_2,CREATURE_AZURE_SPELLBREAKER_1,CREATURE_AZURE_SPELLBREAKER_2,CREATURE_AZURE_MAGE_SLAYER_1,CREATURE_AZURE_MAGE_SLAYER_2,CREATURE_AZURE_BINDER_1,CREATURE_AZURE_BINDER_2); + uint32 entry = RAND(CREATURE_AZURE_INVADER_1, CREATURE_AZURE_INVADER_2, CREATURE_AZURE_SPELLBREAKER_1, CREATURE_AZURE_SPELLBREAKER_2, CREATURE_AZURE_MAGE_SLAYER_1, CREATURE_AZURE_MAGE_SLAYER_2, CREATURE_AZURE_BINDER_1, CREATURE_AZURE_BINDER_2); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } } @@ -653,21 +653,21 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1); + pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } void JustSummoned(Creature *pSummoned) { listOfMobs.Summon(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } void SummonedMobDied(Creature *pSummoned) { listOfMobs.Despawn(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } }; @@ -733,57 +733,57 @@ struct violet_hold_trashAI : public npc_escortAI { case 0: 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); + 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); + secondPortalRouteID = urand(0, 1); switch(secondPortalRouteID) { case 0: 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); + 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++) - 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); + 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++) - 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); + 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++) - 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); + 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++) - 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); + 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++) - 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); + 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; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } void JustDied(Unit * /*unit*/) { - if (Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) - CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me); + if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) + CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); } void CreatureStartAttackDoor() @@ -791,7 +791,7 @@ struct violet_hold_trashAI : public npc_escortAI me->SetReactState(REACT_PASSIVE); DoCast(SPELL_DESTROY_DOOR_SEAL); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1); } }; @@ -838,7 +838,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(),SPELL_CLEAVE); + DoCast(me->getVictim(), SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -846,7 +846,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_IMPALE); + DoCast(pTarget, SPELL_IMPALE); uiImpaleTimer = 4000; } else uiImpaleTimer -= diff; } @@ -855,14 +855,14 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_BRUTAL_STRIKE); + DoCast(me->getVictim(), SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->getVictim(),SPELL_SUNDER_ARMOR); - uiSunderArmorTimer = urand(8000,10000); + DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; DoMeleeAttackIfReady(); @@ -916,7 +916,7 @@ public: { if (uiArcaneExplosionTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION,H_SPELL_ARCANE_EXPLOSION)); + DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); uiArcaneExplosionTimer = 5000; } else uiArcaneExplosionTimer -= diff; @@ -924,7 +924,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BARRAGE,H_SPELL_ARCANE_BARRAGE)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BARRAGE, H_SPELL_ARCANE_BARRAGE)); uiArcainBarrageTimer = 6000; } else uiArcainBarrageTimer -= diff; } @@ -933,7 +933,7 @@ public: { if (uiFrostNovaTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA)); + DoCast(DUNGEON_MODE(SPELL_FROST_NOVA, H_SPELL_FROST_NOVA)); uiFrostNovaTimer = 5000; } else uiFrostNovaTimer -= diff; @@ -941,7 +941,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_FROSTBOLT,H_SPELL_FROSTBOLT)); + DoCast(pTarget, DUNGEON_MODE(SPELL_FROSTBOLT, H_SPELL_FROSTBOLT)); uiFrostboltTimer = 6000; } else uiFrostboltTimer -= diff; } @@ -990,7 +990,7 @@ public: { if (uiArcaneEmpowermentTimer <= diff) { - DoCast(me,SPELL_ARCANE_EMPOWERMENT); + DoCast(me, SPELL_ARCANE_EMPOWERMENT); uiArcaneEmpowermentTimer = 14000; } else uiArcaneEmpowermentTimer -= diff; } @@ -1001,7 +1001,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SPELL_LOCK); + DoCast(pTarget, SPELL_SPELL_LOCK); uiSpellLockTimer = 9000; } else uiSpellLockTimer -= diff; } @@ -1048,14 +1048,14 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->getVictim(),SPELL_CONCUSSION_BLOW); + DoCast(me->getVictim(), SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; if (uiMagicReflectionTimer <= diff) { DoCast(SPELL_MAGIC_REFLECTION); - uiMagicReflectionTimer = urand(10000,15000); + uiMagicReflectionTimer = urand(10000, 15000); } else uiMagicReflectionTimer -= diff; DoMeleeAttackIfReady(); @@ -1105,7 +1105,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true); if (pTarget) - DoCast(pTarget,SPELL_TACTICAL_BLINK); + DoCast(pTarget, SPELL_TACTICAL_BLINK); uiTacticalBlinkTimer = 6000; TacticalBlinkCasted = true; } else uiTacticalBlinkTimer -= diff; @@ -1116,7 +1116,7 @@ public: if (uiBackstabTimer <= diff) { Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true); - DoCast(pTarget,SPELL_BACKSTAB); + DoCast(pTarget, SPELL_BACKSTAB); TacticalBlinkCasted = false; uiBackstabTimer =1300; } else uiBackstabTimer -= diff; @@ -1167,7 +1167,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BLAST,H_SPELL_ARCANE_BLAST)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); uiArcaneBlastTimer = 6000; } else uiArcaneBlastTimer -= diff; @@ -1175,7 +1175,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SLOW); + DoCast(pTarget, SPELL_SLOW); uiSlowTimer = 5000; } else uiSlowTimer -= diff; } @@ -1186,13 +1186,13 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_CHAINS_OF_ICE); + DoCast(pTarget, SPELL_CHAINS_OF_ICE); uiChainsOfIceTimer = 7000; } else uiChainsOfIceTimer -= diff; if (uiConeOfColdTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD,H_SPELL_CONE_OF_COLD)); + DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD, H_SPELL_CONE_OF_COLD)); uiConeOfColdTimer = 5000; } else uiConeOfColdTimer -= diff; } @@ -1243,13 +1243,13 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_MORTAL_STRIKE); + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; if (uiWhirlwindTimer <= diff) { - DoCast(me,SPELL_WHIRLWIND_OF_STEEL); + DoCast(me, SPELL_WHIRLWIND_OF_STEEL); uiWhirlwindTimer = 8000; } else uiWhirlwindTimer -= diff; @@ -1299,15 +1299,15 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_STREAM,H_SPELL_ARCANE_STREAM)); - uiArcaneStreamTimer = urand(0,5000)+5000; + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_STREAM, H_SPELL_ARCANE_STREAM)); + uiArcaneStreamTimer = urand(0, 5000)+5000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; } else uiArcaneStreamTimer -= diff; if (uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2) { - DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION,H_SPELL_MANA_DETONATION)); - uiManaDetonationTimer = urand(2000,6000); + DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION, H_SPELL_MANA_DETONATION)); + uiManaDetonationTimer = urand(2000, 6000); } else uiManaDetonationTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 7b0c5de36d2..a675bcc6f03 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -100,13 +100,13 @@ public: case 1: DoCast(me, SPELL_EXPLODE_CART, true); DoCast(me, SPELL_SUMMON_CART, true); - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->SetUInt32Value(GAMEOBJECT_FACTION, 14); uiPhaseTimer = 3000; Phase = 2; break; case 2: - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->UseDoorOrButton(); DoCast(me, SPELL_EXPLODE_CART, true); uiPhaseTimer = 3000; @@ -139,7 +139,7 @@ public: case 7: DoCast(me, SPELL_EXPLODE_CART, true); if (Player *caster = Unit::GetPlayer(*me, casterGuid)) - caster->KilledMonster(me->GetCreatureInfo(),me->GetGUID()); + caster->KilledMonster(me->GetCreatureInfo(), me->GetGUID()); uiPhaseTimer = 5000; Phase = 8; break; @@ -362,14 +362,14 @@ public: { if (CAST_PLR(Killer)->GetQuestStatus(11611) == QUEST_STATUS_INCOMPLETE) { - uint8 uiRand = urand(0,99); + uint8 uiRand = urand(0, 99); if (uiRand < 25) { - Killer->CastSpell(me,45532,true); + Killer->CastSpell(me, 45532, true); CAST_PLR(Killer)->KilledMonsterCredit(WARSONG_PEON, 0); } else if (uiRand < 75) - Killer->CastSpell(me, nerubarVictims[urand(0,2)], true); + Killer->CastSpell(me, nerubarVictims[urand(0, 2)], true); } } } @@ -403,7 +403,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE, 5.0f)) if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); } @@ -471,7 +471,7 @@ public: { if (setCrateNumber) { - me->AddAura(SPELL_CRATES_CARRIED,me); + me->AddAura(SPELL_CRATES_CARRIED, me); setCrateNumber = false; } @@ -600,7 +600,7 @@ public: if (summon->isSummon()) if (Unit *pTemp = summon->GetSummoner()) if (pTemp->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(),0); + CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); @@ -742,12 +742,12 @@ public: switch(IntroPhase) { case 1: - //DoScriptText(SAY_WP_1_LUR_START,me); + //DoScriptText(SAY_WP_1_LUR_START, me); IntroPhase = 2; IntroTimer = 7500; break; case 2: - //DoScriptText(SAY_WP_1_LUR_END,me); + //DoScriptText(SAY_WP_1_LUR_END, me); IntroPhase = 3; IntroTimer = 7500; break; @@ -757,12 +757,12 @@ public: IntroTimer = 0; break; case 4: - //DoScriptText(SAY_WP_41_LUR_START,me); + //DoScriptText(SAY_WP_41_LUR_START, me); IntroPhase = 5; IntroTimer = 8000; break; case 5: - //DoScriptText(SAY_WP_41_LUR_END,me); + //DoScriptText(SAY_WP_41_LUR_END, me); IntroPhase = 6; IntroTimer = 2500; break; @@ -889,7 +889,7 @@ public: { if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { - pHarpooner->KilledMonsterCredit(26175,0); + pHarpooner->KilledMonsterCredit(26175, 0); pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED); SetFollowComplete(); HarpoonerGUID = 0; @@ -1031,13 +1031,13 @@ public: pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pArthas->SetReactState(REACT_PASSIVE); pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f,3564.841309f,477.433014f); + pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f,3568.882080f,477.433014f); + pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f, 3568.882080f, 477.433014f); } me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -1084,7 +1084,7 @@ public: case 2: if (pTalbot) { - pTalbot->UpdateEntry(NPC_PRINCE_VALANAR,ALLIANCE); + pTalbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE); pTalbot->setFaction(14); pTalbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTalbot->SetReactState(REACT_PASSIVE); @@ -1115,13 +1115,13 @@ public: break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArlos = pArlos->GetGUID(); pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1300,7 +1300,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; } }; @@ -1332,7 +1332,7 @@ public: me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; } }; @@ -1378,9 +1378,9 @@ public: LeryssaGUID = 0; ArlosGUID = 0; bCheck = false; - uiShadowBoltTimer = urand(5000,12000); - uiDeflectionTimer = urand(20000,25000); - uiSoulBlastTimer = urand (12000,18000); + uiShadowBoltTimer = urand(5000, 12000); + uiDeflectionTimer = urand(20000, 25000); + uiSoulBlastTimer = urand (12000, 18000); } void MovementInform(uint32 uiType, uint32 /*uiId*/) { @@ -1389,7 +1389,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; } void UpdateAI(const uint32 uiDiff) @@ -1411,19 +1411,19 @@ public: if (uiShadowBoltTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(5000,12000); + uiShadowBoltTimer = urand(5000, 12000); } else uiShadowBoltTimer -= uiDiff; if (uiDeflectionTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_DEFLECTION); - uiDeflectionTimer = urand(20000,25000); + uiDeflectionTimer = urand(20000, 25000); } else uiDeflectionTimer -= uiDiff; if (uiSoulBlastTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SOUL_BLAST); - uiSoulBlastTimer = urand (12000,18000); + uiSoulBlastTimer = urand (12000, 18000); } else uiSoulBlastTimer -= uiDiff; } @@ -1447,7 +1447,7 @@ public: pLeryssa->RemoveAura(SPELL_STUN); pLeryssa->ClearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); + pLeryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); @@ -1500,7 +1500,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; bDone = true; } else @@ -1564,7 +1564,7 @@ public: if (Unit* pThassarian = CAST_SUM(me)->GetSummoner()) { DoScriptText(SAY_THASSARIAN_7, pThassarian); - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pThassarian)->AI())->uiPhase = 16; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pThassarian)->AI())->uiPhase = 16; } uiPhaseTimer = 5000; Phase = 0; @@ -1765,7 +1765,7 @@ public: if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID)) { DoScriptText(SAY_IMPRISIONED_BERYL_5, me); - pCaster->KilledMonsterCredit(25478,0); + pCaster->KilledMonsterCredit(25478, 0); uiStep = 6; } } @@ -1875,7 +1875,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; case 20: - me->SetPhaseMask(1,true); + me->SetPhaseMask(1, true); DoScriptText(SAY_5, me); me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); if (pPlayer) @@ -1954,7 +1954,7 @@ public: { if (Bonker_agro == 0) { - DoScriptText(SAY_bonker_1,me); + DoScriptText(SAY_bonker_1, me); Bonker_agro++; } DoMeleeAttackIfReady(); @@ -2046,7 +2046,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetGoState(GO_STATE_ACTIVE); @@ -2063,7 +2063,7 @@ public: { Position pos; me->GetRandomNearPosition(pos, 10.0f); - me->GetMotionMaster()->MovePoint(0,pos); + me->GetMotionMaster()->MovePoint(0, pos); bStarted = false; } else uiTimer -= diff; @@ -2085,7 +2085,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetLootState(GO_JUST_DEACTIVATED); @@ -2132,7 +2132,7 @@ public: { Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); if (qInfo) - CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0); + CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); } } }; @@ -2162,7 +2162,7 @@ public: uint32 uiExplosionTimer; void Reset() { - uiExplosionTimer = urand(5000,10000); + uiExplosionTimer = urand(5000, 10000); } void UpdateAI(const uint32 diff) { @@ -2177,7 +2177,7 @@ public: { Player* pOwner = uOwner->ToPlayer(); if (pOwner && pOwner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE) - pOwner->KilledMonsterCredit(cCredit->GetEntry(),cCredit->GetGUID()); + pOwner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID()); } } } @@ -2216,7 +2216,7 @@ public: void Reset() { - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } void UpdateAI(const uint32 diff) @@ -2224,12 +2224,12 @@ public: if (uiTimer <= diff) { me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); - GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1,10); + GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1, 10); if (!pCannon) - pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2,10); + pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2, 10); if (pCannon) pCannon->Use(me); - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } else uiTimer -= diff; @@ -2299,10 +2299,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() > 6680) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_CALANDRA: @@ -2313,10 +2313,10 @@ public: { if (Creature* pOrb = *itr) if ((pOrb->GetPositionY() < 6680) && (pOrb->GetPositionY() > 6630)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_WATKINS: @@ -2327,10 +2327,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() < 6630) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; } @@ -2403,10 +2403,10 @@ public: void Reset() { if (uiEmoteState) - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,uiEmoteState); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, uiEmoteState); if (uiNpcFlags) - me->SetUInt32Value(UNIT_NPC_FLAGS,uiNpcFlags); + me->SetUInt32Value(UNIT_NPC_FLAGS, uiNpcFlags); uiEventTimer = 0; uiEventPhase = 0; @@ -2439,7 +2439,7 @@ public: void AttackPlayer() { me->setFaction(14); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) me->AI()->AttackStart(pPlayer); } @@ -2453,18 +2453,18 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0); - DoScriptText(SAY_HIDDEN_CULTIST_1,me); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + DoScriptText(SAY_HIDDEN_CULTIST_1, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_GUARD_MITCHELLS: - DoScriptText(SAY_HIDDEN_CULTIST_2,me); + DoScriptText(SAY_HIDDEN_CULTIST_2, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_TOM_HEGGER: - DoScriptText(SAY_HIDDEN_CULTIST_3,me); + DoScriptText(SAY_HIDDEN_CULTIST_3, me); uiEventTimer = 5000; uiEventPhase = 2; break; @@ -2474,8 +2474,8 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - DoScriptText(SAY_HIDDEN_CULTIST_4,me); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + DoScriptText(SAY_HIDDEN_CULTIST_4, me); + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { me->SetInFront(pPlayer); me->SendMovementFlagUpdate(); diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 92040aed8d8..277f9d98091 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -87,13 +87,13 @@ public: }else { if (!uiTargetGUID) - if (Creature* pOrb = GetClosestCreatureWithEntry(me,NPC_TRANSITUS_SHIELD_DUMMY,32.0f)) + if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) uiTargetGUID = pOrb->GetGUID(); } - if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + if (Creature* pOrb = me->GetCreature(*me, uiTargetGUID)) + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } }; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 67e0ad5d776..fa08e8cafb4 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -195,7 +195,7 @@ public: if (Unit::GetCreature(*me, MrfloppyGUID)) { DoScriptText(SAY_WORGHAGGRO1, me); - me->SummonCreature(NPC_HUNGRY_WORG,me->GetPositionX()+5,me->GetPositionY()+2,me->GetPositionZ()+1,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + me->SummonCreature(NPC_HUNGRY_WORG, me->GetPositionX()+5, me->GetPositionY()+2, me->GetPositionZ()+1, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; case 11: @@ -206,7 +206,7 @@ public: if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, me); - if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG,me->GetPositionX()+10,me->GetPositionY()+8,me->GetPositionZ()+2,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000)) + if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); RWORGGUID = RWORG->GetGUID(); @@ -217,7 +217,7 @@ public: { if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); - DoCast(Mrfloppy,SPELL_MRFLOPPY); + DoCast(Mrfloppy, SPELL_MRFLOPPY); } break; case 19: @@ -242,7 +242,7 @@ public: RWORG->Kill(Mrfloppy); Mrfloppy->ExitVehicle(); RWORG->setFaction(14); - RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10,RWORG->GetPositionY()+80,RWORG->GetPositionZ()); + RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10, RWORG->GetPositionY()+80, RWORG->GetPositionZ()); DoScriptText(SAY_VICTORY2, me); } } @@ -600,7 +600,7 @@ public: && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); - DoScriptText(RAND(RANDOM_SAY_1,RANDOM_SAY_2,RANDOM_SAY_3),caster); + DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); if(me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else @@ -656,7 +656,7 @@ public: void Reset() { - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } void UpdateAI(const uint32 uiDiff) @@ -667,7 +667,7 @@ public: if (uiChargedSentryTotem <= uiDiff) { DoCast(SPELL_CHARGED_SENTRY_TOTEM); - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } else uiChargedSentryTotem -= uiDiff; @@ -728,7 +728,7 @@ public: { uiPlayerGUID = 0; uiTimer = 0; - uiChopTimer = urand(10000,12500); + uiChopTimer = urand(10000, 12500); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); } @@ -776,7 +776,7 @@ public: if (uiChopTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CHOP); - uiChopTimer = urand(10000,12000); + uiChopTimer = urand(10000, 12000); } else uiChopTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1729f5f55d5..3810d445b61 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -114,22 +114,22 @@ public: me->DespawnOrUnsummon(); break; case 5: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 6: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; case 8: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 9: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); break; case 10: @@ -139,7 +139,7 @@ public: SetRun(false); break; case 14: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; @@ -400,7 +400,7 @@ public: void JustSummoned(Creature* pSummon) { - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { if (pPlayer->isAlive()) { diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index b29e3929722..6075bc52d25 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -187,7 +187,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451f,952.472f,547.554f,0.38f); + pCreature->SummonCreature(NPC_ARGENT_VALIANT, 8575.451f, 952.472f, 547.554f, 0.38f); } return true; } @@ -214,7 +214,7 @@ public: { npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) { - pCreature->GetMotionMaster()->MovePoint(0,8599.258f,963.951f,547.553f); + pCreature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f); pCreature->setFaction(35); //wrong faction in db? } @@ -240,10 +240,10 @@ public: if (uiDamage > me->GetHealth() && pDoneBy->GetTypeId() == TYPEID_PLAYER) { uiDamage = 0; - CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT,0); + CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT, 0); me->setFaction(35); me->DespawnOrUnsummon(5000); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); EnterEvadeMode(); } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 7d2e0c2e2a1..f7011e00e6a 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -56,7 +56,7 @@ class npc_four_car_garage : public CreatureScript return; } - me->CastSpell(who,spellId,true); + me->CastSpell(who, spellId, true); } } }; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 53dfca49d5f..f03236f86a4 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -101,7 +101,7 @@ public: if (Player* pPlayer = GetPlayerForEscort()) pPlayer->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me); // me->RestoreFaction(); - DoScriptText(SAY_END_IRO,me); + DoScriptText(SAY_END_IRO, me); SetRun(false); break; } @@ -307,7 +307,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) if (pSummoner) - me->GetMotionMaster()->MovePoint(0,pSummoner->GetPositionX(),pSummoner->GetPositionY(),pSummoner->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ()); } void UpdateAI(const uint32 /*uiDiff*/) diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index a8575d72ee7..3f6003e8903 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -213,7 +213,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE, 5.0f)) { if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 2bf418a2130..befe34faeed 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -92,7 +92,7 @@ public: if (Creature* pRageclaw = Unit::GetCreature(*me, RageclawGUID)) { UnlockRageclaw(pCaster); - pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(),RageclawGUID); + pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(), RageclawGUID); me->DisappearAndDie(); } else @@ -122,7 +122,7 @@ const char * SAY_RAGECLAW_1 = "I poop on you, trollses!"; const char * SAY_RAGECLAW_2 = "ARRRROOOOGGGGAAAA!"; const char * SAY_RAGECLAW_3 = "No more mister nice wolvar!"; -#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1,SAY_RAGECLAW_2,SAY_RAGECLAW_3) +#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1, SAY_RAGECLAW_2, SAY_RAGECLAW_3) class npc_captured_rageclaw : public CreatureScript { @@ -292,10 +292,10 @@ struct BossAndAdd static BossAndAdd Boss[]= { - {NPC_GARGORAL,NPC_FIEND_WATER,SPELL_CRASHING_WAVE,SPELL_ORB_OF_WATER}, - {NPC_AZ_BARIN,NPC_FIEND_AIR,SPELL_BLAST_OF_AIR,SPELL_ORB_OF_STORMS}, - {NPC_DUKE_SINGEN,NPC_FIEND_FIRE,SPELL_MAGMA_WAVE,SPELL_ORB_OF_FLAME}, - {NPC_ERATHIUS,NPC_FIEND_EARTH,SPELL_SHOCKWAVE,SPELL_BOULDER}, + {NPC_GARGORAL, NPC_FIEND_WATER, SPELL_CRASHING_WAVE, SPELL_ORB_OF_WATER}, + {NPC_AZ_BARIN, NPC_FIEND_AIR, SPELL_BLAST_OF_AIR, SPELL_ORB_OF_STORMS}, + {NPC_DUKE_SINGEN, NPC_FIEND_FIRE, SPELL_MAGMA_WAVE, SPELL_ORB_OF_FLAME}, + {NPC_ERATHIUS, NPC_FIEND_EARTH, SPELL_SHOCKWAVE, SPELL_BOULDER}, }; const Position SpawnPosition[] = @@ -457,7 +457,7 @@ public: std::string sText = ("The grand Amphitheater of Anguish awaits, " + std::string(pPlayer->GetName()) + ". Remember, once a battle starts you have to stay in the area. WIN OR DIE!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 9; } @@ -468,7 +468,7 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 3000; uiPhase = 8; } @@ -484,19 +484,19 @@ public: return; std::string sText = ("Here we are once again, ladies and gentlemen. The epic struggle between life and death in the Amphitheater of Anguish! For this round we have " + std::string(pPlayer->GetName()) + " versus the hulking jormungar, Yg... Yggd? Yggdoze? Who comes up with these names?! " + std::string(pPlayer->GetName()) + " versus big worm!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 10000; uiPhase = 10; } break; case 10: me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); - DoScriptText(EMOTE_YGGDRAS_SPAWN,me); + DoScriptText(EMOTE_YGGDRAS_SPAWN, me); uiPhase = 0; break; case 11: if (Creature* pCreature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - DoScriptText(SAY_STINKBEARD_SPAWN,pCreature); + DoScriptText(SAY_STINKBEARD_SPAWN, pCreature); uiPhase = 0; break; case 12: @@ -505,20 +505,20 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 13; } break; case 13: - DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN,me); + DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN, me); uiTimer = 3000; uiPhase = 14; break; case 14: - uiBossRandom = urand(0,3); - if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss,SpawnPosition[2],TEMPSUMMON_CORPSE_DESPAWN, 1000)) - pCreature->AI()->SetData(1,uiBossRandom); + uiBossRandom = urand(0, 3); + if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss, SpawnPosition[2], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + pCreature->AI()->SetData(1, uiBossRandom); uiPhase = 0; break; } @@ -624,7 +624,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); uiBattleShoutTimer = 7000; } @@ -646,7 +646,7 @@ public: if (uiFishyScentTimer <= uiDiff) { - if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pAffected, SPELL_FISHY_SCENT); AffectedGUID = pAffected->GetGUID(); @@ -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)) @@ -723,7 +723,7 @@ public: { npc_korrak_bloodragerAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -746,7 +746,7 @@ public: switch(uiI) { case 6: - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); break; @@ -844,7 +844,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -872,7 +872,7 @@ public: if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) { std::string sText = (std::string(pKiller->GetName()) + " has defeated Yg.. Yggg-really big worm!"); - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -916,7 +916,7 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_PASSIVE); - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -928,7 +928,7 @@ public: void Reset() { - me->AddAura(SPELL_THUNDERBLADE,me); + me->AddAura(SPELL_THUNDERBLADE, me); uiKnockAwayTimer = 10000; uiStinkyBeardTimer = 15000; bEnrage = false; @@ -966,7 +966,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1015,7 +1015,7 @@ public: pPlayer->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, pKiller); std::string sText = ("And with AUTHORITY, " + std::string(pKiller->GetName()) + " dominates the magnataur lord! Stinkbeard's clan is gonna miss him back home in the Dragonblight!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1051,7 +1051,7 @@ public: { uiBossRandom = 0; uiSpellEntry = 0; - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); bAddAttack = false; } @@ -1074,9 +1074,9 @@ public: for (uint8 uiI = 0; uiI < 16 ; uiI++) { - if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd,AddSpawnPosition[uiI])) + if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd, AddSpawnPosition[uiI])) { - pSummon->AI()->SetData(1,uiBossRandom); + pSummon->AI()->SetData(1, uiBossRandom); SummonList.push_back(pSummon->GetGUID()); } } @@ -1111,7 +1111,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1123,7 +1123,7 @@ public: { DoCastVictim(Boss[uiBossRandom].uiSpell); - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); } else uiElementalSpellTimer -= uiDiff; if (!bAddAttack && !HealthAbovePct(20)) @@ -1160,7 +1160,7 @@ public: std::string sText = (std::string(pKiller->GetName()) + " is victorious once more!"); if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1192,7 +1192,7 @@ public: me->GetMotionMaster()->MoveIdle(); uiSpell = 0; - uiMissleTimer = urand(2000,7000); + uiMissleTimer = urand(2000, 7000); } void AttackStart(Unit* pWho) @@ -1219,8 +1219,8 @@ public: { if (uiMissleTimer <= uiDiff) { - DoCast(me,uiSpell); // this spell is not supported ... YET! - uiMissleTimer = urand(2000,7000); + DoCast(me, uiSpell); // this spell is not supported ... YET! + uiMissleTimer = urand(2000, 7000); } else uiMissleTimer -= uiDiff; } @@ -1322,14 +1322,14 @@ public: // say random text me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - DoScriptText(RAND(SAY_RECRUIT_1,SAY_RECRUIT_2,SAY_RECRUIT_3), me); + DoScriptText(RAND(SAY_RECRUIT_1, SAY_RECRUIT_2, SAY_RECRUIT_3), me); m_uiTimer = 3000; m_uiPhase = 2; break; case 2: // walk forward me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(0,me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); m_uiTimer = 5000; m_uiPhase = 3; break; @@ -1401,11 +1401,11 @@ public: { if (pPlayer->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) { - Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY,20.0f); + Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY, 20.0f); if (pGymerDummy) { pGO->UseDoorOrButton(); - pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(),pGymerDummy->GetGUID()); + pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(), pGymerDummy->GetGUID()); pGymerDummy->CastSpell(pGymerDummy, 55529, true); pGymerDummy->DisappearAndDie(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index b1b82aef1d8..1a69c6a828d 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -31,8 +31,8 @@ OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_UnitsSummonedSide(0) { - SetCapturePointData(EPCapturePoints[EP_EWT].entry,EPCapturePoints[EP_EWT].map,EPCapturePoints[EP_EWT].x,EPCapturePoints[EP_EWT].y,EPCapturePoints[EP_EWT].z,EPCapturePoints[EP_EWT].o,EPCapturePoints[EP_EWT].rot0,EPCapturePoints[EP_EWT].rot1,EPCapturePoints[EP_EWT].rot2,EPCapturePoints[EP_EWT].rot3); - AddObject(EP_EWT_FLAGS,EPTowerFlags[EP_EWT].entry,EPTowerFlags[EP_EWT].map,EPTowerFlags[EP_EWT].x,EPTowerFlags[EP_EWT].y,EPTowerFlags[EP_EWT].z,EPTowerFlags[EP_EWT].o,EPTowerFlags[EP_EWT].rot0,EPTowerFlags[EP_EWT].rot1,EPTowerFlags[EP_EWT].rot2,EPTowerFlags[EP_EWT].rot3); + SetCapturePointData(EPCapturePoints[EP_EWT].entry, EPCapturePoints[EP_EWT].map, EPCapturePoints[EP_EWT].x, EPCapturePoints[EP_EWT].y, EPCapturePoints[EP_EWT].z, EPCapturePoints[EP_EWT].o, EPCapturePoints[EP_EWT].rot0, EPCapturePoints[EP_EWT].rot1, EPCapturePoints[EP_EWT].rot2, EPCapturePoints[EP_EWT].rot3); + AddObject(EP_EWT_FLAGS, EPTowerFlags[EP_EWT].entry, EPTowerFlags[EP_EWT].map, EPTowerFlags[EP_EWT].x, EPTowerFlags[EP_EWT].y, EPTowerFlags[EP_EWT].z, EPTowerFlags[EP_EWT].o, EPTowerFlags[EP_EWT].rot0, EPTowerFlags[EP_EWT].rot1, EPTowerFlags[EP_EWT].rot2, EPTowerFlags[EP_EWT].rot3); } void OPvPCapturePointEP_EWT::ChangeState() @@ -40,12 +40,12 @@ void OPvPCapturePointEP_EWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0; } @@ -58,14 +58,14 @@ void OPvPCapturePointEP_EWT::ChangeState() artkit = 2; SummonSupportUnitAtNorthpassTower(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonSupportUnitAtNorthpassTower(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -160,7 +160,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team) for (uint8 i = 0; i < EP_EWT_NUM_CREATURES; ++i) { DelCreature(i); - AddCreature(i,ct[i].entry,ct[i].teamval,ct[i].map,ct[i].x,ct[i].y,ct[i].z,ct[i].o,1000000); + AddCreature(i, ct[i].entry, ct[i].teamval, ct[i].map, ct[i].x, ct[i].y, ct[i].z, ct[i].o, 1000000); } } } @@ -169,8 +169,8 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team) OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_SummonedGOSide(0) { - SetCapturePointData(EPCapturePoints[EP_NPT].entry,EPCapturePoints[EP_NPT].map,EPCapturePoints[EP_NPT].x,EPCapturePoints[EP_NPT].y,EPCapturePoints[EP_NPT].z,EPCapturePoints[EP_NPT].o,EPCapturePoints[EP_NPT].rot0,EPCapturePoints[EP_NPT].rot1,EPCapturePoints[EP_NPT].rot2,EPCapturePoints[EP_NPT].rot3); - AddObject(EP_NPT_FLAGS,EPTowerFlags[EP_NPT].entry,EPTowerFlags[EP_NPT].map,EPTowerFlags[EP_NPT].x,EPTowerFlags[EP_NPT].y,EPTowerFlags[EP_NPT].z,EPTowerFlags[EP_NPT].o,EPTowerFlags[EP_NPT].rot0,EPTowerFlags[EP_NPT].rot1,EPTowerFlags[EP_NPT].rot2,EPTowerFlags[EP_NPT].rot3); + SetCapturePointData(EPCapturePoints[EP_NPT].entry, EPCapturePoints[EP_NPT].map, EPCapturePoints[EP_NPT].x, EPCapturePoints[EP_NPT].y, EPCapturePoints[EP_NPT].z, EPCapturePoints[EP_NPT].o, EPCapturePoints[EP_NPT].rot0, EPCapturePoints[EP_NPT].rot1, EPCapturePoints[EP_NPT].rot2, EPCapturePoints[EP_NPT].rot3); + AddObject(EP_NPT_FLAGS, EPTowerFlags[EP_NPT].entry, EPTowerFlags[EP_NPT].map, EPTowerFlags[EP_NPT].x, EPTowerFlags[EP_NPT].y, EPTowerFlags[EP_NPT].z, EPTowerFlags[EP_NPT].o, EPTowerFlags[EP_NPT].rot0, EPTowerFlags[EP_NPT].rot1, EPTowerFlags[EP_NPT].rot2, EPTowerFlags[EP_NPT].rot3); } void OPvPCapturePointEP_NPT::ChangeState() @@ -178,12 +178,12 @@ void OPvPCapturePointEP_NPT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0; } @@ -196,14 +196,14 @@ void OPvPCapturePointEP_NPT::ChangeState() artkit = 2; SummonGO(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; SummonGO(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -301,10 +301,10 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) { m_SummonedGOSide = team; DelObject(EP_NPT_BUFF); - AddObject(EP_NPT_BUFF,EP_NPT_LordaeronShrine.entry,EP_NPT_LordaeronShrine.map,EP_NPT_LordaeronShrine.x,EP_NPT_LordaeronShrine.y,EP_NPT_LordaeronShrine.z,EP_NPT_LordaeronShrine.o,EP_NPT_LordaeronShrine.rot0,EP_NPT_LordaeronShrine.rot1,EP_NPT_LordaeronShrine.rot2,EP_NPT_LordaeronShrine.rot3); + AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3); GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]); if (go) - go->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 84 : 83)); + go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83)); } } @@ -312,8 +312,8 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team) OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_GraveyardSide(0) { - SetCapturePointData(EPCapturePoints[EP_CGT].entry,EPCapturePoints[EP_CGT].map,EPCapturePoints[EP_CGT].x,EPCapturePoints[EP_CGT].y,EPCapturePoints[EP_CGT].z,EPCapturePoints[EP_CGT].o,EPCapturePoints[EP_CGT].rot0,EPCapturePoints[EP_CGT].rot1,EPCapturePoints[EP_CGT].rot2,EPCapturePoints[EP_CGT].rot3); - AddObject(EP_CGT_FLAGS,EPTowerFlags[EP_CGT].entry,EPTowerFlags[EP_CGT].map,EPTowerFlags[EP_CGT].x,EPTowerFlags[EP_CGT].y,EPTowerFlags[EP_CGT].z,EPTowerFlags[EP_CGT].o,EPTowerFlags[EP_CGT].rot0,EPTowerFlags[EP_CGT].rot1,EPTowerFlags[EP_CGT].rot2,EPTowerFlags[EP_CGT].rot3); + SetCapturePointData(EPCapturePoints[EP_CGT].entry, EPCapturePoints[EP_CGT].map, EPCapturePoints[EP_CGT].x, EPCapturePoints[EP_CGT].y, EPCapturePoints[EP_CGT].z, EPCapturePoints[EP_CGT].o, EPCapturePoints[EP_CGT].rot0, EPCapturePoints[EP_CGT].rot1, EPCapturePoints[EP_CGT].rot2, EPCapturePoints[EP_CGT].rot3); + AddObject(EP_CGT_FLAGS, EPTowerFlags[EP_CGT].entry, EPTowerFlags[EP_CGT].map, EPTowerFlags[EP_CGT].x, EPTowerFlags[EP_CGT].y, EPTowerFlags[EP_CGT].z, EPTowerFlags[EP_CGT].o, EPTowerFlags[EP_CGT].rot0, EPTowerFlags[EP_CGT].rot1, EPTowerFlags[EP_CGT].rot2, EPTowerFlags[EP_CGT].rot3); } void OPvPCapturePointEP_CGT::ChangeState() @@ -321,12 +321,12 @@ void OPvPCapturePointEP_CGT::ChangeState() // if changing from controlling alliance to horde or vice versa if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0; } @@ -339,14 +339,14 @@ void OPvPCapturePointEP_CGT::ChangeState() artkit = 2; LinkGraveYard(ALLIANCE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; artkit = 1; LinkGraveYard(HORDE); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -432,8 +432,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team) if (m_GraveyardSide != team) { m_GraveyardSide = team; - sObjectMgr->RemoveGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false); - sObjectMgr->AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false); + sObjectMgr->RemoveGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false); + sObjectMgr->AddGraveYardLink(EP_GraveYardId, EP_GraveYardZone, team, false); } } @@ -441,8 +441,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team) OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP *pvp) : OPvPCapturePoint(pvp), m_FlightMasterSpawned(0), m_TowerState(EP_TS_N) { - SetCapturePointData(EPCapturePoints[EP_PWT].entry,EPCapturePoints[EP_PWT].map,EPCapturePoints[EP_PWT].x,EPCapturePoints[EP_PWT].y,EPCapturePoints[EP_PWT].z,EPCapturePoints[EP_PWT].o,EPCapturePoints[EP_PWT].rot0,EPCapturePoints[EP_PWT].rot1,EPCapturePoints[EP_PWT].rot2,EPCapturePoints[EP_PWT].rot3); - AddObject(EP_PWT_FLAGS,EPTowerFlags[EP_PWT].entry,EPTowerFlags[EP_PWT].map,EPTowerFlags[EP_PWT].x,EPTowerFlags[EP_PWT].y,EPTowerFlags[EP_PWT].z,EPTowerFlags[EP_PWT].o,EPTowerFlags[EP_PWT].rot0,EPTowerFlags[EP_PWT].rot1,EPTowerFlags[EP_PWT].rot2,EPTowerFlags[EP_PWT].rot3); + SetCapturePointData(EPCapturePoints[EP_PWT].entry, EPCapturePoints[EP_PWT].map, EPCapturePoints[EP_PWT].x, EPCapturePoints[EP_PWT].y, EPCapturePoints[EP_PWT].z, EPCapturePoints[EP_PWT].o, EPCapturePoints[EP_PWT].rot0, EPCapturePoints[EP_PWT].rot1, EPCapturePoints[EP_PWT].rot2, EPCapturePoints[EP_PWT].rot3); + AddObject(EP_PWT_FLAGS, EPTowerFlags[EP_PWT].entry, EPTowerFlags[EP_PWT].map, EPTowerFlags[EP_PWT].x, EPTowerFlags[EP_PWT].y, EPTowerFlags[EP_PWT].z, EPTowerFlags[EP_PWT].o, EPTowerFlags[EP_PWT].rot0, EPTowerFlags[EP_PWT].rot1, EPTowerFlags[EP_PWT].rot2, EPTowerFlags[EP_PWT].rot3); } void OPvPCapturePointEP_PWT::ChangeState() @@ -450,12 +450,12 @@ void OPvPCapturePointEP_PWT::ChangeState() // if changing from controlling alliance to horde or vice versa if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0; } else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State ) { - sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); + sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0; } @@ -468,14 +468,14 @@ void OPvPCapturePointEP_PWT::ChangeState() SummonFlightMaster(ALLIANCE); artkit = 2; ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = ALLIANCE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A)); break; case OBJECTIVESTATE_HORDE: m_TowerState = EP_TS_H; SummonFlightMaster(HORDE); artkit = 1; ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = HORDE; - if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); + if (m_OldState != m_State) sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H)); break; case OBJECTIVESTATE_NEUTRAL: m_TowerState = EP_TS_N; @@ -572,13 +572,13 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) { m_FlightMasterSpawned = team; DelCreature(EP_PWT_FLIGHTMASTER); - AddCreature(EP_PWT_FLIGHTMASTER,EP_PWT_FlightMaster.entry,team,EP_PWT_FlightMaster.map,EP_PWT_FlightMaster.x,EP_PWT_FlightMaster.y,EP_PWT_FlightMaster.z,EP_PWT_FlightMaster.o); + AddCreature(EP_PWT_FLIGHTMASTER, EP_PWT_FlightMaster.entry, team, EP_PWT_FlightMaster.map, EP_PWT_FlightMaster.x, EP_PWT_FlightMaster.y, EP_PWT_FlightMaster.z, EP_PWT_FlightMaster.o); /* // sky - we need update gso code 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)); + c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68)); if(c) { GossipOption gso; @@ -620,7 +620,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team) OutdoorPvPEP::OutdoorPvPEP() { m_TypeId = OUTDOOR_PVP_EP; - memset(EP_Controls,0,sizeof(EP_Controls)); + memset(EP_Controls, 0, sizeof(EP_Controls)); m_AllianceTowersControlled = 0; m_HordeTowersControlled = 0; } @@ -649,8 +649,8 @@ bool OutdoorPvPEP::Update(uint32 diff) ++m_AllianceTowersControlled; else if (EP_Controls[i] == HORDE) ++m_HordeTowersControlled; - SendUpdateWorldState(EP_UI_TOWER_COUNT_A,m_AllianceTowersControlled); - SendUpdateWorldState(EP_UI_TOWER_COUNT_H,m_HordeTowersControlled); + SendUpdateWorldState(EP_UI_TOWER_COUNT_A, m_AllianceTowersControlled); + SendUpdateWorldState(EP_UI_TOWER_COUNT_H, m_HordeTowersControlled); BuffTeams(); } return true; @@ -664,14 +664,14 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5) - plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true); + plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true); } else { if (m_HordeTowersControlled && m_HordeTowersControlled < 5) - plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true); + plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -699,7 +699,7 @@ void OutdoorPvPEP::BuffTeams() for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]); if (m_AllianceTowersControlled && m_AllianceTowersControlled < 5) - plr->CastSpell(plr,EP_AllianceBuffs[m_AllianceTowersControlled-1],true); + plr->CastSpell(plr, EP_AllianceBuffs[m_AllianceTowersControlled-1], true); } } for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr) @@ -709,7 +709,7 @@ void OutdoorPvPEP::BuffTeams() for (int i = 0; i < 4; ++i) plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]); if (m_HordeTowersControlled && m_HordeTowersControlled < 5) - plr->CastSpell(plr,EP_HordeBuffs[m_HordeTowersControlled-1],true); + plr->CastSpell(plr, EP_HordeBuffs[m_HordeTowersControlled-1], true); } } } @@ -729,35 +729,35 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data) void OutdoorPvPEP::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A,0); - plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N,0); - - plr->SendUpdateWorldState(EP_EWT_A,0); - plr->SendUpdateWorldState(EP_EWT_H,0); - plr->SendUpdateWorldState(EP_EWT_N,0); - plr->SendUpdateWorldState(EP_EWT_N_A,0); - plr->SendUpdateWorldState(EP_EWT_N_H,0); - - plr->SendUpdateWorldState(EP_PWT_A,0); - plr->SendUpdateWorldState(EP_PWT_H,0); - plr->SendUpdateWorldState(EP_PWT_N,0); - plr->SendUpdateWorldState(EP_PWT_N_A,0); - plr->SendUpdateWorldState(EP_PWT_N_H,0); - - plr->SendUpdateWorldState(EP_NPT_A,0); - plr->SendUpdateWorldState(EP_NPT_H,0); - plr->SendUpdateWorldState(EP_NPT_N,0); - plr->SendUpdateWorldState(EP_NPT_N_A,0); - plr->SendUpdateWorldState(EP_NPT_N_H,0); - - plr->SendUpdateWorldState(EP_CGT_A,0); - plr->SendUpdateWorldState(EP_CGT_H,0); - plr->SendUpdateWorldState(EP_CGT_N,0); - plr->SendUpdateWorldState(EP_CGT_N_A,0); - plr->SendUpdateWorldState(EP_CGT_N_H,0); + plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_H, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, 0); + + plr->SendUpdateWorldState(EP_EWT_A, 0); + plr->SendUpdateWorldState(EP_EWT_H, 0); + plr->SendUpdateWorldState(EP_EWT_N, 0); + plr->SendUpdateWorldState(EP_EWT_N_A, 0); + plr->SendUpdateWorldState(EP_EWT_N_H, 0); + + plr->SendUpdateWorldState(EP_PWT_A, 0); + plr->SendUpdateWorldState(EP_PWT_H, 0); + plr->SendUpdateWorldState(EP_PWT_N, 0); + plr->SendUpdateWorldState(EP_PWT_N_A, 0); + plr->SendUpdateWorldState(EP_PWT_N_H, 0); + + plr->SendUpdateWorldState(EP_NPT_A, 0); + plr->SendUpdateWorldState(EP_NPT_H, 0); + plr->SendUpdateWorldState(EP_NPT_N, 0); + plr->SendUpdateWorldState(EP_NPT_N_A, 0); + plr->SendUpdateWorldState(EP_NPT_N_H, 0); + + plr->SendUpdateWorldState(EP_CGT_A, 0); + plr->SendUpdateWorldState(EP_CGT_H, 0); + plr->SendUpdateWorldState(EP_CGT_N, 0); + plr->SendUpdateWorldState(EP_CGT_N_A, 0); + plr->SendUpdateWorldState(EP_CGT_N_H, 0); } class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 76d056a7b78..6ce4cd1bcb2 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -114,31 +114,31 @@ enum EP_GoSummons enum EP_Towers { EP_EWT = 0, // plaguelands 03 - EP_NPT,// plaguelands 01 - EP_PWT,// plaguelands 04 - EP_CGT,// plaguelands 02 + EP_NPT, // plaguelands 01 + EP_PWT, // plaguelands 04 + EP_CGT, // plaguelands 02 EP_TOWER_NUM }; const go_type EPCapturePoints[EP_TOWER_NUM] = { - {182097,0,2574.51f,-4794.89f,144.704f,-1.45003f,-0.097056f,0.095578f,-0.656229f,0.742165f}, - {181899,0,3181.08f,-4379.36f,174.123f,-2.03472f,-0.065392f,0.119494f,-0.842275f,0.521553f}, - {182098,0,2962.71f,-3042.31f,154.789f,2.08426f,-0.074807f,-0.113837f,0.855928f,0.49883f}, - {182096,0,1860.85f,-3731.23f,196.716f,-2.53214f,0.033967f,-0.131914f,0.944741f,-0.298177f} + {182097, 0, 2574.51f, -4794.89f, 144.704f, -1.45003f, -0.097056f, 0.095578f, -0.656229f, 0.742165f}, + {181899, 0, 3181.08f, -4379.36f, 174.123f, -2.03472f, -0.065392f, 0.119494f, -0.842275f, 0.521553f}, + {182098, 0, 2962.71f, -3042.31f, 154.789f, 2.08426f, -0.074807f, -0.113837f, 0.855928f, 0.49883f}, + {182096, 0, 1860.85f, -3731.23f, 196.716f, -2.53214f, 0.033967f, -0.131914f, 0.944741f, -0.298177f} }; const go_type EPTowerFlags[EP_TOWER_NUM] = { - {182106,0,2569.60f,-4772.93f,115.399f,2.72271f,0.0f,0.0f,0.978148f,0.207912f}, - {182106,0,3148.17f,-4365.51f,145.029f,1.53589f,0.0f,0.0f,0.694658f,0.71934f}, - {182106,0,2992.63f,-3022.95f,125.593f,3.03687f,0.0f,0.0f,0.99863f,0.052336f}, - {182106,0,1838.42f,-3703.56f,167.713f,0.890118f,0.0f,0.0f,0.430511f,0.902585f} + {182106, 0, 2569.60f, -4772.93f, 115.399f, 2.72271f, 0.0f, 0.0f, 0.978148f, 0.207912f}, + {182106, 0, 3148.17f, -4365.51f, 145.029f, 1.53589f, 0.0f, 0.0f, 0.694658f, 0.71934f}, + {182106, 0, 2992.63f, -3022.95f, 125.593f, 3.03687f, 0.0f, 0.0f, 0.99863f, 0.052336f}, + {182106, 0, 1838.42f, -3703.56f, 167.713f, 0.890118f, 0.0f, 0.0f, 0.430511f, 0.902585f} }; -const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705}; +const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691, 10699, 10701, 10705}; -const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692,10698,10700,10704}; +const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692, 10698, 10700, 10704}; const uint8 EP_NUM_CREATURES = 6; const uint8 EP_EWT_NUM_CREATURES = 5; @@ -147,20 +147,20 @@ const uint8 EP_EWT_NUM_CREATURES = 5; // should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] = { - {17635,469,0, 3167.61f,-4352.09f,138.20f,4.5811f}, - {17647,469,0, 3172.74f,-4352.99f,139.14f,4.9873f}, - {17647,469,0, 3165.89f,-4354.46f,138.67f,3.7244f}, - {17647,469,0, 3164.65f,-4350.26f,138.22f,2.4794f}, - {17647,469,0, 3169.91f,-4349.68f,138.37f,0.7444f} + {17635, 469, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f}, + {17647, 469, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f}, + {17647, 469, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f}, + {17647, 469, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f}, + {17647, 469, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f} }; const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] = { - {17995,67,0, 3167.61f,-4352.09f,138.20f,4.5811f}, - {17996,67,0, 3172.74f,-4352.99f,139.14f,4.9873f}, - {17996,67,0, 3165.89f,-4354.46f,138.67f,3.7244f}, - {17996,67,0, 3164.65f,-4350.26f,138.22f,2.4794f}, - {17996,67,0, 3169.91f,-4349.68f,138.37f,0.7444f} + {17995, 67, 0, 3167.61f, -4352.09f, 138.20f, 4.5811f}, + {17996, 67, 0, 3172.74f, -4352.99f, 139.14f, 4.9873f}, + {17996, 67, 0, 3165.89f, -4354.46f, 138.67f, 3.7244f}, + {17996, 67, 0, 3164.65f, -4350.26f, 138.22f, 2.4794f}, + {17996, 67, 0, 3169.91f, -4349.68f, 138.37f, 0.7444f} }; enum EP_TowerStates @@ -175,10 +175,10 @@ enum EP_TowerStates }; // when spawning, pay attention at setting the faction manually! -const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5f,-3049.11f,120.126f,5.75959f}; +const creature_type EP_PWT_FlightMaster = {17209, 0, 0, 2987.5f, -3049.11f, 120.126f, 5.75959f}; // after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id); -const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72f,-4355.91f,138.785f,1.69297f,0.0f,0.0f,0.748956f,0.66262f}; +const go_type EP_NPT_LordaeronShrine = {181682, 0, 3167.72f, -4355.91f, 138.785f, 1.69297f, 0.0f, 0.0f, 0.748956f, 0.66262f}; class OutdoorPvPEP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index f711710e448..7a4e3b2abaf 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -25,15 +25,15 @@ #include "Language.h" #include "ScriptPCH.h" -const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A,LANG_OPVP_HP_LOSE_OVERLOOK_A,LANG_OPVP_HP_LOSE_STADIUM_A}; +const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A, LANG_OPVP_HP_LOSE_OVERLOOK_A, LANG_OPVP_HP_LOSE_STADIUM_A}; -const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H,LANG_OPVP_HP_LOSE_OVERLOOK_H,LANG_OPVP_HP_LOSE_STADIUM_H}; +const uint32 HP_LANG_LOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_H, LANG_OPVP_HP_LOSE_OVERLOOK_H, LANG_OPVP_HP_LOSE_STADIUM_H}; -const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A,LANG_OPVP_HP_CAPTURE_OVERLOOK_A,LANG_OPVP_HP_CAPTURE_STADIUM_A}; +const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A, LANG_OPVP_HP_CAPTURE_OVERLOOK_A, LANG_OPVP_HP_CAPTURE_STADIUM_A}; -const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H,LANG_OPVP_HP_CAPTURE_OVERLOOK_H,LANG_OPVP_HP_CAPTURE_STADIUM_H}; +const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H, LANG_OPVP_HP_CAPTURE_OVERLOOK_H, LANG_OPVP_HP_CAPTURE_STADIUM_H}; -OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp,OutdoorPvPHPTowerType type) +OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp, OutdoorPvPHPTowerType type) : OPvPCapturePoint(pvp), m_TowerType(type) { SetCapturePointData(HPCapturePoints[type].entry, @@ -72,11 +72,11 @@ bool OutdoorPvPHP::SetupOutdoorPvP() for (int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i) RegisterZone(OutdoorPvPHPBuffZones[i]); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_BROKEN_HILL)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_BROKEN_HILL)); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_OVERLOOK)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_OVERLOOK)); - AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_STADIUM)); + AddCapturePoint(new OPvPCapturePointHP(this, HP_TOWER_STADIUM)); return true; } @@ -87,14 +87,14 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled >=3) - plr->CastSpell(plr,AllianceBuff,true); + plr->CastSpell(plr, AllianceBuff, true); } else { if (m_HordeTowersControlled >=3) - plr->CastSpell(plr,HordeBuff,true); + plr->CastSpell(plr, HordeBuff, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -133,18 +133,18 @@ bool OutdoorPvPHP::Update(uint32 diff) void OutdoorPvPHP::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A,0); - plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H,0); - plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H,0); - plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY,0); + plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_H, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_H, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_COUNT_A, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0); for (int i = 0; i < HP_TOWER_NUM; ++i) { - plr->SendUpdateWorldState(HP_MAP_N[i],0); - plr->SendUpdateWorldState(HP_MAP_A[i],0); - plr->SendUpdateWorldState(HP_MAP_H[i],0); + plr->SendUpdateWorldState(HP_MAP_N[i], 0); + plr->SendUpdateWorldState(HP_MAP_A[i], 0); + plr->SendUpdateWorldState(HP_MAP_H[i], 0); } } @@ -175,13 +175,13 @@ void OPvPCapturePointHP::ChangeState() field = HP_MAP_A[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType])); break; case OBJECTIVESTATE_HORDE: field = HP_MAP_H[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: field = HP_MAP_N[m_TowerType]; @@ -216,7 +216,7 @@ void OPvPCapturePointHP::ChangeState() artkit2 = HP_TowerArtKit_A[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled<3) ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType])); break; case OBJECTIVESTATE_HORDE: field = HP_MAP_H[m_TowerType]; @@ -224,7 +224,7 @@ void OPvPCapturePointHP::ChangeState() artkit2 = HP_TowerArtKit_H[m_TowerType]; if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled<3) ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); + sWorld->SendZoneText(OutdoorPvPHPBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: field = HP_MAP_N[m_TowerType]; @@ -326,9 +326,9 @@ void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed) return; if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE) - plr->CastSpell(plr,AlliancePlayerKillReward,true); + plr->CastSpell(plr, AlliancePlayerKillReward, true); else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE) - plr->CastSpell(plr,HordePlayerKillReward,true); + plr->CastSpell(plr, HordePlayerKillReward, true); } class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index 0e1b26ac277..e53a3537b83 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -40,11 +40,11 @@ enum OutdoorPvPHPTowerType HP_TOWER_NUM = 3 }; -const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032,19028,19029}; +const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032, 19028, 19029}; -const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404,11396,11388}; +const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404, 11396, 11388}; -const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403,11395,11387}; +const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403, 11395, 11387}; enum OutdoorPvPHPWorldStates { @@ -59,30 +59,30 @@ enum OutdoorPvPHPWorldStates HP_UI_TOWER_SLIDER_DISPLAY = 2473 }; -const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5,0x9b2,0x9a8}; +const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5, 0x9b2, 0x9a8}; -const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3,0x9b0,0x9a7}; +const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3, 0x9b0, 0x9a7}; -const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4,0x9b1,0x9a6}; +const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4, 0x9b1, 0x9a6}; -const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65,62,67}; +const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65, 62, 67}; -const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64,61,68}; +const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64, 61, 68}; -const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69}; +const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66, 63, 69}; const go_type HPCapturePoints[HP_TOWER_NUM] = { - {182175,530,-471.462f,3451.09f,34.6432f,0.174533f,0.0f,0.0f,0.087156f,0.996195f}, // 0 - Broken Hill - {182174,530,-184.889f,3476.93f,38.205f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f}, // 1 - Overlook - {182173,530,-290.016f,3702.42f,56.6729f,0.034907f,0.0f,0.0f,0.017452f,0.999848f} // 2 - Stadium + {182175, 530, -471.462f, 3451.09f, 34.6432f, 0.174533f, 0.0f, 0.0f, 0.087156f, 0.996195f}, // 0 - Broken Hill + {182174, 530, -184.889f, 3476.93f, 38.205f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f}, // 1 - Overlook + {182173, 530, -290.016f, 3702.42f, 56.6729f, 0.034907f, 0.0f, 0.0f, 0.017452f, 0.999848f} // 2 - Stadium }; const go_type HPTowerFlags[HP_TOWER_NUM] = { - {183514,530,-467.078f,3528.17f,64.7121f,3.14159f,0.0f,0.0f,1.0f,0.0f}, // 0 broken hill - {182525,530,-187.887f,3459.38f,60.0403f,-3.12414f,0.0f,0.0f,0.999962f,-0.008727f}, // 1 overlook - {183515,530,-289.610f,3696.83f,75.9447f,3.12414f,0.0f,0.0f,0.999962f,0.008727f} // 2 stadium + {183514, 530, -467.078f, 3528.17f, 64.7121f, 3.14159f, 0.0f, 0.0f, 1.0f, 0.0f}, // 0 broken hill + {182525, 530, -187.887f, 3459.38f, 60.0403f, -3.12414f, 0.0f, 0.0f, 0.999962f, -0.008727f}, // 1 overlook + {183515, 530, -289.610f, 3696.83f, 75.9447f, 3.12414f, 0.0f, 0.0f, 0.999962f, 0.008727f} // 2 stadium }; class OPvPCapturePointHP : public OPvPCapturePoint diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index a796dd7c918..a015de48f88 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -33,11 +33,11 @@ void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed) { if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam()) { - plr->KilledMonsterCredit(NA_CREDIT_MARKER,0); // 0 guid, btw it isn't even used in killedmonster function :S + plr->KilledMonsterCredit(NA_CREDIT_MARKER, 0); // 0 guid, btw it isn't even used in killedmonster function :S if (plr->GetTeam() == ALLIANCE) - plr->CastSpell(plr,NA_KILL_TOKEN_ALLIANCE,true); + plr->CastSpell(plr, NA_KILL_TOKEN_ALLIANCE, true); else - plr->CastSpell(plr,NA_KILL_TOKEN_HORDE,true); + plr->CastSpell(plr, NA_KILL_TOKEN_HORDE, true); } } @@ -93,7 +93,7 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team) else return; for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) - AddCreature(i,creatures[i].entry,creatures[i].teamval,creatures[i].map,creatures[i].x,creatures[i].y,creatures[i].z,creatures[i].o,1000000); + AddCreature(i, creatures[i].entry, creatures[i].teamval, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, 1000000); } void OPvPCapturePointNA::DeSpawnNPCs() @@ -122,7 +122,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team) i == NA_BOMB_WAGON_N || i == NA_BOMB_WAGON_E) continue; // roosts and bomb wagons are spawned when someone uses the matching destroyed roost - AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3); + AddObject(i, gos[i].entry, gos[i].map, gos[i].x, gos[i].y, gos[i].z, gos[i].o, gos[i].rot0, gos[i].rot1, gos[i].rot2, gos[i].rot3); } } @@ -137,15 +137,15 @@ void OPvPCapturePointNA::DeSpawnGOs() void OPvPCapturePointNA::FactionTakeOver(uint32 team) { if (m_ControllingFaction) - sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false); + sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); if (m_ControllingFaction == ALLIANCE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); else if (m_ControllingFaction == HORDE) - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); m_ControllingFaction = team; if (m_ControllingFaction) - sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false); + sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); DeSpawnGOs(); DeSpawnNPCs(); SpawnGOsForTeam(team); @@ -163,7 +163,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A)); } else { @@ -175,7 +175,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team) m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 1); m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); - sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H)); } UpdateWyvernRoostWorldState(NA_ROOST_S); UpdateWyvernRoostWorldState(NA_ROOST_N); @@ -207,7 +207,7 @@ OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFactio m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0), m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) { - SetCapturePointData(182210,530,-1572.57f,7945.3f,-22.475f,2.05949f,0.0f,0.0f,0.857167f,0.515038f); + SetCapturePointData(182210, 530, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f); } bool OutdoorPvPNA::SetupOutdoorPvP() @@ -229,8 +229,8 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone) { // add buffs if (plr->GetTeam() == m_obj->m_ControllingFaction) - plr->CastSpell(plr,NA_CAPTURE_BUFF,true); - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + plr->CastSpell(plr, NA_CAPTURE_BUFF, true); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -299,34 +299,34 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPNA::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW,0); - plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW,0); - plr->SendUpdateWorldState(NA_UI_GUARDS_MAX,0); - plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS,0); - plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,0); - plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0); - plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0); + plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0); + plr->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0); + plr->SendUpdateWorldState(NA_UI_GUARDS_MAX, 0); + plr->SendUpdateWorldState(NA_UI_GUARDS_LEFT, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, 0); + plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, 0); + plr->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEUTRAL, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_A, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_NEU_H, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE, 0); + plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE, 0); } bool OutdoorPvPNA::Update(uint32 diff) @@ -346,7 +346,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_N]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_SOUTH: @@ -354,7 +354,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_S]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_WEST: @@ -362,7 +362,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_W]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; case NA_SPELL_FLY_EAST: @@ -370,7 +370,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj nodes[1] = FlightPathEndNodes[NA_ROOST_E]; plr->ActivateTaxiPathTo(nodes); plr->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP); - plr->UpdatePvP(true,true); + plr->UpdatePvP(true, true); retval = true; break; default: @@ -401,7 +401,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj if (count > 0 && item) { - plr->SendNewItem(item,count,true,false); + plr->SendNewItem(item, count, true, false); } return true; @@ -521,10 +521,10 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid) DelObject(del2); if (add>-1) - AddObject(add,gos[add].entry,gos[add].map,gos[add].x,gos[add].y,gos[add].z,gos[add].o,gos[add].rot0,gos[add].rot1,gos[add].rot2,gos[add].rot3); + AddObject(add, gos[add].entry, gos[add].map, gos[add].x, gos[add].y, gos[add].z, gos[add].o, gos[add].rot0, gos[add].rot1, gos[add].rot2, gos[add].rot3); if (add2>-1) - AddObject(add2,gos[add2].entry,gos[add2].map,gos[add2].x,gos[add2].y,gos[add2].z,gos[add2].o,gos[add2].rot0,gos[add2].rot1,gos[add2].rot2,gos[add2].rot3); + AddObject(add2, gos[add2].entry, gos[add2].map, gos[add2].x, gos[add2].y, gos[add2].z, gos[add2].o, gos[add2].rot0, gos[add2].rot1, gos[add2].rot2, gos[add2].rot3); return retval; } @@ -550,7 +550,7 @@ bool OPvPCapturePointNA::Update(uint32 diff) if (m_GuardsAlive == 0) m_capturable = true; // update the guard count for the players in zone - m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT,m_GuardsAlive); + m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); } } else m_GuardCheckTimer -= diff; @@ -625,11 +625,11 @@ 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) @@ -637,28 +637,28 @@ void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) switch(roost) { case NA_ROOST_S: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A,uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H,uint32(bool(m_WyvernStateSouth & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A,uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_H, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_NEU_A, uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_H, uint32(bool(m_WyvernStateSouth & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_SOUTH_A, uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE))); break; case NA_ROOST_N: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A,uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H,uint32(bool(m_WyvernStateNorth & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A,uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_H, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_NEU_A, uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_H, uint32(bool(m_WyvernStateNorth & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_NORTH_A, uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE))); break; case NA_ROOST_W: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H,uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A,uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H,uint32(bool(m_WyvernStateWest & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A,uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_H, uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_NEU_A, uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_H, uint32(bool(m_WyvernStateWest & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_WEST_A, uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE))); break; case NA_ROOST_E: - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H,uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A,uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H,uint32(bool(m_WyvernStateEast & WYVERN_HORDE))); - m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A,uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_H, uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_NEU_A, uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_H, uint32(bool(m_WyvernStateEast & WYVERN_HORDE))); + m_PvP->SendUpdateWorldState(NA_MAP_WYVERN_EAST_A, uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE))); break; } } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index b9a4f82ec90..eba273245eb 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -105,8 +105,8 @@ enum ControlGOTypes NA_CONTROL_GO_NUM = 12 }; -const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103,105,107,109}; -const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104,106,108,110}; +const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103, 105, 107, 109}; +const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104, 106, 108, 110}; enum FlightSpellsNA { @@ -119,39 +119,39 @@ enum FlightSpellsNA // spawned when the alliance is attacking, horde is in control const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = { - {182267,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_ROOST_SOUTH - {182280,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_ROOST_WEST - {182281,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_ROOST_NORTH - {182282,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_ROOST_EAST - - {182222,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_BOMB_WAGON_SOUTH - {182272,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_BOMB_WAGON_WEST - {182273,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_BOMB_WAGON_NORTH - {182274,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_BOMB_WAGON_EAST - - {182266,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH - {182275,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_ALLY_ROOST_WEST - {182276,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_ALLY_ROOST_NORTH - {182277,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_ALLY_ROOST_EAST + {182267, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_ROOST_SOUTH + {182280, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_ROOST_WEST + {182281, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_ROOST_NORTH + {182282, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST + + {182222, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH + {182272, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST + {182273, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH + {182274, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST + + {182266, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH + {182275, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST + {182276, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_ALLY_ROOST_NORTH + {182277, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_ALLY_ROOST_EAST }; // spawned when the horde is attacking, alliance is in control const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = { - {182301,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_ROOST_SOUTH - {182302,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_ROOST_WEST - {182303,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_ROOST_NORTH - {182304,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_ROOST_EAST - - {182305,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_BOMB_WAGON_SOUTH - {182306,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_BOMB_WAGON_WEST - {182307,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_BOMB_WAGON_NORTH - {182308,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_BOMB_WAGON_EAST - - {182297,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH - {182298,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_HORDE_ROOST_WEST - {182299,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_HORDE_ROOST_NORTH - {182300,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_HORDE_ROOST_EAST + {182301, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_ROOST_SOUTH + {182302, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_ROOST_WEST + {182303, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_ROOST_NORTH + {182304, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST + + {182305, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH + {182306, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST + {182307, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH + {182308, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST + + {182297, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH + {182298, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST + {182299, 530, -1384.52f, 7779.33f, -11.1663f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //DESTROYED_HORDE_ROOST_NORTH + {182300, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST }; enum ControlNPCTypes @@ -183,50 +183,50 @@ enum ControlNPCTypes const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = { - {18816,67,530,-1523.92f,7951.76f,-17.6942f,3.51172f}, - {18821,67,530,-1527.75f,7952.46f,-17.6948f,3.99317f}, - {21474,67,530,-1520.14f,7927.11f,-20.2527f,3.39389f}, - {21484,67,530,-1524.84f,7930.34f,-20.182f,3.6405f}, - {21483,67,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, - {18192,67,530,-1654.06f,8000.46f,-26.59f,3.37f}, - {18192,67,530,-1487.18f,7899.1f,-19.53f,0.954f}, - {18192,67,530,-1480.88f,7908.79f,-19.19f,4.485f}, - {18192,67,530,-1540.56f,7995.44f,-20.45f,0.947f}, - {18192,67,530,-1546.95f,8000.85f,-20.72f,6.035f}, - {18192,67,530,-1595.31f,7860.53f,-21.51f,3.747f}, - {18192,67,530,-1642.31f,7995.59f,-25.8f,3.317f}, - {18192,67,530,-1545.46f,7995.35f,-20.63f,1.094f}, - {18192,67,530,-1487.58f,7907.99f,-19.27f,5.567f}, - {18192,67,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, - {18192,67,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, - {18192,67,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, - {18192,67,530,-1550.6f,7944.45f,-21.63f,3.559f}, - {18192,67,530,-1545.57f,7935.83f,-21.13f,3.448f}, - {18192,67,530,-1550.86f,7937.56f,-21.7f,3.801f} + {18816, 67, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f}, + {18821, 67, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f}, + {21474, 67, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f}, + {21484, 67, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f}, + {21483, 67, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, + {18192, 67, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, + {18192, 67, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, + {18192, 67, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, + {18192, 67, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, + {18192, 67, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, + {18192, 67, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, + {18192, 67, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, + {18192, 67, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, + {18192, 67, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, + {18192, 67, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, + {18192, 67, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, + {18192, 67, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, + {18192, 67, 530, -1550.6f, 7944.45f, -21.63f, 3.559f}, + {18192, 67, 530, -1545.57f, 7935.83f, -21.13f, 3.448f}, + {18192, 67, 530, -1550.86f, 7937.56f, -21.7f, 3.801f} }; const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = { - {18817,469,530,-1591.18f,8020.39f,-22.2042f,4.59022f}, - {18822,469,530,-1588.0f,8019.0f,-22.2042f,4.06662f}, - {21485,469,530,-1521.93f,7927.37f,-20.2299f,3.24631f}, - {21487,469,530,-1540.33f,7971.95f,-20.7186f,3.07178f}, - {21488,469,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, - {18256,469,530,-1654.06f,8000.46f,-26.59f,3.37f}, - {18256,469,530,-1487.18f,7899.1f,-19.53f,0.954f}, - {18256,469,530,-1480.88f,7908.79f,-19.19f,4.485f}, - {18256,469,530,-1540.56f,7995.44f,-20.45f,0.947f}, - {18256,469,530,-1546.95f,8000.85f,-20.72f,6.035f}, - {18256,469,530,-1595.31f,7860.53f,-21.51f,3.747f}, - {18256,469,530,-1642.31f,7995.59f,-25.8f,3.317f}, - {18256,469,530,-1545.46f,7995.35f,-20.63f,1.094f}, - {18256,469,530,-1487.58f,7907.99f,-19.27f,5.567f}, - {18256,469,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, - {18256,469,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, - {18256,469,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, - {18256,469,530,-1603.75f,8000.36f,-24.18f,4.516f}, - {18256,469,530,-1585.73f,7994.68f,-23.29f,4.439f}, - {18256,469,530,-1595.5f,7991.27f,-23.53f,4.738f} + {18817, 469, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f}, + {18822, 469, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f}, + {21485, 469, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f}, + {21487, 469, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f}, + {21488, 469, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, + {18256, 469, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, + {18256, 469, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, + {18256, 469, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, + {18256, 469, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, + {18256, 469, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, + {18256, 469, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, + {18256, 469, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, + {18256, 469, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, + {18256, 469, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, + {18256, 469, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, + {18256, 469, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, + {18256, 469, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, + {18256, 469, 530, -1603.75f, 8000.36f, -24.18f, 4.516f}, + {18256, 469, 530, -1585.73f, 7994.68f, -23.29f, 4.439f}, + {18256, 469, 530, -1595.5f, 7991.27f, -23.53f, 4.738f} }; enum WyvernStates diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index dd93db2aa76..ab336e3b2ba 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -43,16 +43,16 @@ void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPSI::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(SI_GATHERED_A,0); - plr->SendUpdateWorldState(SI_GATHERED_H,0); - plr->SendUpdateWorldState(SI_SILITHYST_MAX,0); + plr->SendUpdateWorldState(SI_GATHERED_A, 0); + plr->SendUpdateWorldState(SI_GATHERED_H, 0); + plr->SendUpdateWorldState(SI_SILITHYST_MAX, 0); } void OutdoorPvPSI::UpdateWorldState() { - SendUpdateWorldState(SI_GATHERED_A,m_Gathered_A); - SendUpdateWorldState(SI_GATHERED_H,m_Gathered_H); - SendUpdateWorldState(SI_SILITHYST_MAX,SI_MAX_RESOURCES); + SendUpdateWorldState(SI_GATHERED_A, m_Gathered_A); + SendUpdateWorldState(SI_GATHERED_H, m_Gathered_H); + SendUpdateWorldState(SI_SILITHYST_MAX, SI_MAX_RESOURCES); } bool OutdoorPvPSI::SetupOutdoorPvP() @@ -70,8 +70,8 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/) void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone) { if (plr->GetTeam() == m_LastController) - plr->CastSpell(plr,SI_CENARION_FAVOR,true); - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + plr->CastSpell(plr, SI_CENARION_FAVOR, true); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -94,20 +94,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) if (m_Gathered_A >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A)); m_LastController = ALLIANCE; m_Gathered_A = 0; m_Gathered_H = 0; } UpdateWorldState(); // reward player - plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true); + plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true); // add 19 honor - plr->RewardHonor(NULL,1,19); + plr->RewardHonor(NULL, 1, 19); // add 20 cenarion circle repu - plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20); + plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20); // complete quest - plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A,0); + plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_A, 0); } return true; case SI_AREATRIGGER_H: @@ -119,20 +119,20 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger) if (m_Gathered_H >= SI_MAX_RESOURCES) { TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR); - sWorld->SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPSIBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H)); m_LastController = HORDE; m_Gathered_A = 0; m_Gathered_H = 0; } UpdateWorldState(); // reward player - plr->CastSpell(plr,SI_TRACES_OF_SILITHYST,true); + plr->CastSpell(plr, SI_TRACES_OF_SILITHYST, true); // add 19 honor - plr->RewardHonor(NULL,1,19); + plr->RewardHonor(NULL, 1, 19); // add 20 cenarion circle repu - plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609),20); + plr->GetReputationMgr().ModifyReputation(sFactionStore.LookupEntry(609), 20); // complete quest - plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H,0); + plr->KilledMonsterCredit(SI_TURNIN_QUEST_CM_H, 0); } return true; } @@ -152,7 +152,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (atEntry) { // 5.0f is safe-distance - if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius) + if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound GameObject * go = new GameObject; @@ -163,7 +163,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } @@ -182,7 +182,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) if (atEntry) { // 5.0f is safe-distance - if (plr->GetDistance(atEntry->x,atEntry->y,atEntry->z) > 5.0f + atEntry->radius) + if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius) { // he dropped it further, summon mound GameObject * go = new GameObject; @@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId) delete go; return true; } - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), SI_SILITHYST_MOUND, map, plr->GetPhaseMask() , plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), plr->GetOrientation(), 0, 0, 0, 0, 100, GO_STATE_READY)) { delete go; } @@ -215,7 +215,7 @@ bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go { if (!go || spellId != SI_SILITHYST_FLAG_GO_SPELL) return false; - plr->CastSpell(plr,SI_SILITHYST_FLAG,true); + plr->CastSpell(plr, SI_SILITHYST_FLAG, true); if (go->GetGOInfo()->entry == SI_SILITHYST_MOUND) { // despawn go diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index a991a7fc49c..ffcbfd7997e 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -33,7 +33,7 @@ OutdoorPvPTF::OutdoorPvPTF() OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP *pvp, OutdoorPvPTF_TowerType type) : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(TF_TOWERSTATE_N) { - SetCapturePointData(TFCapturePoints[type].entry,TFCapturePoints[type].map,TFCapturePoints[type].x,TFCapturePoints[type].y,TFCapturePoints[type].z,TFCapturePoints[type].o,TFCapturePoints[type].rot0,TFCapturePoints[type].rot1,TFCapturePoints[type].rot2,TFCapturePoints[type].rot3); + SetCapturePointData(TFCapturePoints[type].entry, TFCapturePoints[type].map, TFCapturePoints[type].x, TFCapturePoints[type].y, TFCapturePoints[type].z, TFCapturePoints[type].o, TFCapturePoints[type].rot0, TFCapturePoints[type].rot1, TFCapturePoints[type].rot2, TFCapturePoints[type].rot3); } void OPvPCapturePointTF::FillInitialWorldStates(WorldPacket &data) @@ -69,35 +69,35 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPTF::SendRemoveWorldStates(Player * plr) { - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY,uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A,uint32(0)); - plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY,uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A, uint32(0)); + plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); for (int i = 0; i < TF_TOWER_NUM; ++i) { - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n),uint32(0)); - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h),uint32(0)); - plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a),uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n), uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].h), uint32(0)); + plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a), uint32(0)); } } void OPvPCapturePointTF::UpdateTowerState() { - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n),uint32(bool(m_TowerState & TF_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h),uint32(bool(m_TowerState & TF_TOWERSTATE_H))); - m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a),uint32(bool(m_TowerState & TF_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n), uint32(bool(m_TowerState & TF_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h), uint32(bool(m_TowerState & TF_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a), uint32(bool(m_TowerState & TF_TOWERSTATE_A))); } bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr) @@ -129,18 +129,18 @@ bool OutdoorPvPTF::Update(uint32 diff) { TeamApplyBuff(TEAM_ALLIANCE, TF_CAPTURE_BUFF); m_IsLocked = true; - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(1)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(1)); SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); } else if (m_HordeTowersControlled == TF_TOWER_NUM) { TeamApplyBuff(TEAM_HORDE, TF_CAPTURE_BUFF); m_IsLocked = true; - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(1)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(1)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(0)); } else @@ -160,9 +160,9 @@ bool OutdoorPvPTF::Update(uint32 diff) m_LockTimerUpdate = 0; m_IsLocked = false; SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY, uint32(1)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0)); - SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE, uint32(0)); + SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE, uint32(0)); } else { @@ -176,9 +176,9 @@ bool OutdoorPvPTF::Update(uint32 diff) second_digit = minutes_left % 10; first_digit = minutes_left / 10; - SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,first_digit); - SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,second_digit); - SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,hours_left); + SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT, first_digit); + SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT, second_digit); + SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS, hours_left); } else m_LockTimerUpdate -= diff; m_LockTimer -= diff; } @@ -191,14 +191,14 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_AllianceTowersControlled >= TF_TOWER_NUM) - plr->CastSpell(plr,TF_CAPTURE_BUFF,true); + plr->CastSpell(plr, TF_CAPTURE_BUFF, true); } else { if (m_HordeTowersControlled >= TF_TOWER_NUM) - plr->CastSpell(plr,TF_CAPTURE_BUFF,true); + plr->CastSpell(plr, TF_CAPTURE_BUFF, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -224,11 +224,11 @@ bool OutdoorPvPTF::SetupOutdoorPvP() for (uint8 i = 0; i < OutdoorPvPTFBuffZonesNum; ++i) RegisterZone(OutdoorPvPTFBuffZones[i]); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_N)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NE)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_SE)); - AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_S)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NW)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_N)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_NE)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_SE)); + AddCapturePoint(new OPvPCapturePointTF(this, TF_TOWER_S)); return true; } @@ -250,14 +250,14 @@ void OPvPCapturePointTF::ChangeState() { if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A)); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H)); } uint32 artkit = 21; @@ -269,7 +269,7 @@ void OPvPCapturePointTF::ChangeState() artkit = 2; if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled<TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A)); for (PlayerSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr) (*itr)->AreaExploredOrEventHappens(TF_ALLY_QUEST); break; @@ -278,7 +278,7 @@ void OPvPCapturePointTF::ChangeState() artkit = 1; if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled<TF_TOWER_NUM) ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); + sWorld->SendZoneText(OutdoorPvPTFBuffZones[0], sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H)); for (PlayerSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr) (*itr)->AreaExploredOrEventHappens(TF_HORDE_QUEST); break; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index e11dc6a6704..e42dd54777f 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -55,11 +55,11 @@ enum OutdoorPvPTF_TowerType const go_type TFCapturePoints[TF_TOWER_NUM] = { - {183104,530,-3081.65f,5335.03f,17.1853f,-2.14675f,0.0f,0.0f,0.878817f,-0.477159f}, - {183411,530,-2939.9f,4788.73f,18.987f,2.77507f,0.0f,0.0f,0.983255f,0.182236f}, - {183412,530,-3174.94f,4440.97f,16.2281f,1.86750f,0.0f,0.0f,0.803857f,0.594823f}, - {183413,530,-3603.31f,4529.15f,20.9077f,0.994838f,0.0f,0.0f,0.477159f,0.878817f}, - {183414,530,-3812.37f,4899.3f,17.7249f,0.087266f,0.0f,0.0f,0.043619f,0.999048f} + {183104, 530, -3081.65f, 5335.03f, 17.1853f, -2.14675f, 0.0f, 0.0f, 0.878817f, -0.477159f}, + {183411, 530, -2939.9f, 4788.73f, 18.987f, 2.77507f, 0.0f, 0.0f, 0.983255f, 0.182236f}, + {183412, 530, -3174.94f, 4440.97f, 16.2281f, 1.86750f, 0.0f, 0.0f, 0.803857f, 0.594823f}, + {183413, 530, -3603.31f, 4529.15f, 20.9077f, 0.994838f, 0.0f, 0.0f, 0.477159f, 0.878817f}, + {183414, 530, -3812.37f, 4899.3f, 17.7249f, 0.087266f, 0.0f, 0.0f, 0.043619f, 0.999048f} }; struct tf_tower_world_state @@ -71,11 +71,11 @@ struct tf_tower_world_state const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = { - {0xa79,0xa7a,0xa7b}, - {0xa7e,0xa7d,0xa7c}, - {0xa82,0xa81,0xa80}, - {0xa88,0xa87,0xa86}, - {0xa85,0xa84,0xa83} + {0xa79, 0xa7a, 0xa7b}, + {0xa7e, 0xa7d, 0xa7c}, + {0xa82, 0xa81, 0xa80}, + {0xa88, 0xa87, 0xa86}, + {0xa85, 0xa84, 0xa83} }; const uint32 TFTowerPlayerEnterEvents[TF_TOWER_NUM] = diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index dcd6eb7d7a1..1af7f602c0b 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -29,7 +29,7 @@ OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP *pvp, ZM_BeaconType type) : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(ZM_TOWERSTATE_N) { - SetCapturePointData(ZMCapturePoints[type].entry,ZMCapturePoints[type].map,ZMCapturePoints[type].x,ZMCapturePoints[type].y,ZMCapturePoints[type].z,ZMCapturePoints[type].o,ZMCapturePoints[type].rot0,ZMCapturePoints[type].rot1,ZMCapturePoints[type].rot2,ZMCapturePoints[type].rot3); + SetCapturePointData(ZMCapturePoints[type].entry, ZMCapturePoints[type].map, ZMCapturePoints[type].x, ZMCapturePoints[type].y, ZMCapturePoints[type].z, ZMCapturePoints[type].o, ZMCapturePoints[type].rot0, ZMCapturePoints[type].rot1, ZMCapturePoints[type].rot2, ZMCapturePoints[type].rot3); } void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data) @@ -44,12 +44,12 @@ void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data) void OPvPCapturePointZM_Beacon::UpdateTowerState() { - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a),uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); - m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_n), uint32(bool(m_TowerState & ZM_TOWERSTATE_N))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_a), uint32(bool(m_TowerState & ZM_TOWERSTATE_A))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); + m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h), uint32(bool(m_TowerState & ZM_TOWERSTATE_H))); } bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr) @@ -78,14 +78,14 @@ void OPvPCapturePointZM_Beacon::ChangeState() { if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled) ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled--; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType])); } // if changing from controlling horde to alliance else if (m_OldState == OBJECTIVESTATE_HORDE) { if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled) ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled--; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType])); } switch(m_State) @@ -94,13 +94,13 @@ void OPvPCapturePointZM_Beacon::ChangeState() m_TowerState = ZM_TOWERSTATE_A; if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled<ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled++; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType])); break; case OBJECTIVESTATE_HORDE: m_TowerState = ZM_TOWERSTATE_H; if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled<ZM_NUM_BEACONS) ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled++; - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType])); break; case OBJECTIVESTATE_NEUTRAL: case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: @@ -144,14 +144,14 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone) if (plr->GetTeam() == ALLIANCE) { if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_A) - plr->CastSpell(plr,ZM_CAPTURE_BUFF,true); + plr->CastSpell(plr, ZM_CAPTURE_BUFF, true); } else { if (m_GraveYard->m_GraveYardState & ZM_GRAVEYARD_H) - plr->CastSpell(plr,ZM_CAPTURE_BUFF,true); + plr->CastSpell(plr, ZM_CAPTURE_BUFF, true); } - OutdoorPvP::HandlePlayerEnterZone(plr,zone); + OutdoorPvP::HandlePlayerEnterZone(plr, zone); } void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone) @@ -182,8 +182,8 @@ bool OutdoorPvPZM::SetupOutdoorPvP() for (uint8 i = 0; i < OutdoorPvPZMBuffZonesNum; ++i) RegisterZone(OutdoorPvPZMBuffZones[i]); - AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST)); - AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_EAST)); + AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_WEST)); + AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_EAST)); m_GraveYard = new OPvPCapturePointZM_GraveYard(this); AddCapturePoint(m_GraveYard); // though the update function isn't used, the handleusego is! @@ -196,9 +196,9 @@ void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed) return; if (plr->GetTeam() == ALLIANCE && killed->ToPlayer()->GetTeam() != ALLIANCE) - plr->CastSpell(plr,ZM_AlliancePlayerKillReward,true); + plr->CastSpell(plr, ZM_AlliancePlayerKillReward, true); else if (plr->GetTeam() == HORDE && killed->ToPlayer()->GetTeam() != HORDE) - plr->CastSpell(plr,ZM_HordePlayerKillReward,true); + plr->CastSpell(plr, ZM_HordePlayerKillReward, true); } bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/) @@ -216,28 +216,28 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid) if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A) { if (m_GraveYardState == ZM_GRAVEYARD_H) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H)); m_GraveYardState = ZM_GRAVEYARD_A; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant - AddObject(0,ZM_Banner_A.entry,ZM_Banner_A.map,ZM_Banner_A.x,ZM_Banner_A.y,ZM_Banner_A.z,ZM_Banner_A.o,ZM_Banner_A.rot0,ZM_Banner_A.rot1,ZM_Banner_A.rot2,ZM_Banner_A.rot3); + AddObject(0, ZM_Banner_A.entry, ZM_Banner_A.map, ZM_Banner_A.x, ZM_Banner_A.y, ZM_Banner_A.z, ZM_Banner_A.o, ZM_Banner_A.rot0, ZM_Banner_A.rot1, ZM_Banner_A.rot2, ZM_Banner_A.rot3); sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF); plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A)); } else if (plr->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H) { if (m_GraveYardState == ZM_GRAVEYARD_A) - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A)); m_GraveYardState = ZM_GRAVEYARD_H; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant - AddObject(0,ZM_Banner_H.entry,ZM_Banner_H.map,ZM_Banner_H.x,ZM_Banner_H.y,ZM_Banner_H.z,ZM_Banner_H.o,ZM_Banner_H.rot0,ZM_Banner_H.rot1,ZM_Banner_H.rot2,ZM_Banner_H.rot3); + AddObject(0, ZM_Banner_H.entry, ZM_Banner_H.map, ZM_Banner_H.x, ZM_Banner_H.y, ZM_Banner_H.z, ZM_Banner_H.o, ZM_Banner_H.rot0, ZM_Banner_H.rot1, ZM_Banner_H.rot2, ZM_Banner_H.rot3); sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF); plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H); - sWorld->SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); + sWorld->SendZoneText(ZM_GRAVEYARD_ZONE, sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H)); } UpdateTowerState(); } @@ -251,22 +251,22 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP *pvp) m_GraveYardState = ZM_GRAVEYARD_N; m_FlagCarrierGUID = 0; // add field scouts here - AddCreature(ZM_ALLIANCE_FIELD_SCOUT,ZM_AllianceFieldScout.entry,ZM_AllianceFieldScout.teamval,ZM_AllianceFieldScout.map,ZM_AllianceFieldScout.x,ZM_AllianceFieldScout.y,ZM_AllianceFieldScout.z,ZM_AllianceFieldScout.o); - AddCreature(ZM_HORDE_FIELD_SCOUT,ZM_HordeFieldScout.entry,ZM_HordeFieldScout.teamval,ZM_HordeFieldScout.map,ZM_HordeFieldScout.x,ZM_HordeFieldScout.y,ZM_HordeFieldScout.z,ZM_HordeFieldScout.o); + AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.teamval, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.x, ZM_AllianceFieldScout.y, ZM_AllianceFieldScout.z, ZM_AllianceFieldScout.o); + AddCreature(ZM_HORDE_FIELD_SCOUT, ZM_HordeFieldScout.entry, ZM_HordeFieldScout.teamval, ZM_HordeFieldScout.map, ZM_HordeFieldScout.x, ZM_HordeFieldScout.y, ZM_HordeFieldScout.z, ZM_HordeFieldScout.o); // add neutral banner - AddObject(0,ZM_Banner_N.entry,ZM_Banner_N.map,ZM_Banner_N.x,ZM_Banner_N.y,ZM_Banner_N.z,ZM_Banner_N.o,ZM_Banner_N.rot0,ZM_Banner_N.rot1,ZM_Banner_N.rot2,ZM_Banner_N.rot3); + AddObject(0, ZM_Banner_N.entry, ZM_Banner_N.map, ZM_Banner_N.x, ZM_Banner_N.y, ZM_Banner_N.z, ZM_Banner_N.o, ZM_Banner_N.rot0, ZM_Banner_N.rot1, ZM_Banner_N.rot2, ZM_Banner_N.rot3); } void OPvPCapturePointZM_GraveYard::UpdateTowerState() { - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N))); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H))); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A))); - - m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,uint32(m_BothControllingFaction == ALLIANCE)); - m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,uint32(m_BothControllingFaction != ALLIANCE)); - m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,uint32(m_BothControllingFaction == HORDE)); - m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,uint32(m_BothControllingFaction != HORDE)); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N))); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H))); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A))); + + m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, uint32(m_BothControllingFaction == ALLIANCE)); + m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, uint32(m_BothControllingFaction != ALLIANCE)); + m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, uint32(m_BothControllingFaction == HORDE)); + m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, uint32(m_BothControllingFaction != HORDE)); } void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPacket &data) @@ -329,7 +329,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems /*gso*/) { uint64 guid = c->GetGUID(); - std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); + std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && plr->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A) @@ -342,7 +342,7 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipM bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 /*gossipid*/) { - std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid); + std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid); if (itr != m_CreatureTypes.end()) { Creature * cr = HashMapHolder<Creature>::Find(guid); @@ -353,12 +353,12 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, return true; if (itr->second == ZM_ALLIANCE_FIELD_SCOUT) { - cr->CastSpell(plr,ZM_BATTLE_STANDARD_A,true); + cr->CastSpell(plr, ZM_BATTLE_STANDARD_A, true); m_FlagCarrierGUID = plr->GetGUID(); } else if (itr->second == ZM_HORDE_FIELD_SCOUT) { - cr->CastSpell(plr,ZM_BATTLE_STANDARD_H,true); + cr->CastSpell(plr, ZM_BATTLE_STANDARD_H, true); m_FlagCarrierGUID = plr->GetGUID(); } UpdateTowerState(); @@ -393,32 +393,32 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data) void OutdoorPvPZM::SendRemoveWorldStates(Player *plr) { - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E,0); - plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1,1); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H,0); - plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,0); - plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H,0); - plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A,0); - plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,0); - plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,0); - plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,0); - plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_W, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_E, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_POS_E, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_DISPLAY_E, 0); + plr->SendUpdateWorldState(ZM_WORLDSTATE_UNK_1, 1); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_N, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_H, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_EAST_A, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_N, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_H, 0); + plr->SendUpdateWorldState(ZM_UI_TOWER_WEST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_H, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_EAST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, 0); + plr->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_N, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_H, 0); + plr->SendUpdateWorldState(ZM_MAP_TOWER_WEST_A, 0); + plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, 0); + plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, 0); } class OutdoorPvP_zangarmarsh : public OutdoorPvPScript diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index fbd693293f7..fd0f772e8a5 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -24,7 +24,7 @@ const uint8 OutdoorPvPZMBuffZonesNum = 5; // the buff is cast in these zones -const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3715,3716}; +const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521, 3607, 3717, 3715, 3716}; // linked when the central tower is controlled const uint32 ZM_GRAVEYARD_ZONE = 3521; @@ -47,15 +47,15 @@ enum OutdoorPvPZMSpells }; // banners 182527, 182528, 182529, gotta check them ingame -const go_type ZM_Banner_A = { 182527,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; -const go_type ZM_Banner_H = { 182528,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; -const go_type ZM_Banner_N = { 182529,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; +const go_type ZM_Banner_A = { 182527, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; +const go_type ZM_Banner_H = { 182528, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; +const go_type ZM_Banner_N = { 182529, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f }; // horde field scout spawn data -const creature_type ZM_HordeFieldScout = {18564,67,530,296.625f,7818.4f,42.6294f,5.18363f}; +const creature_type ZM_HordeFieldScout = {18564, 67, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f}; // alliance field scout spawn data -const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395f,6230.08f,22.8351f,0.593412f}; +const creature_type ZM_AllianceFieldScout = {18581, 469, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f}; enum ZMCreatureTypes { @@ -88,8 +88,8 @@ enum ZM_BeaconType const zm_beacon ZMBeaconInfo[ZM_NUM_BEACONS] = { - {2533,2535,2534,2560,2559,2558,2652,2651,2650,11807,11806}, - {2527,2529,2528,2557,2556,2555,2646,2645,2644,11805,11804} + {2533, 2535, 2534, 2560, 2559, 2558, 2652, 2651, 2650, 11807, 11806}, + {2527, 2529, 2528, 2557, 2556, 2555, 2646, 2645, 2644, 11805, 11804} }; const uint32 ZMBeaconCaptureA[ZM_NUM_BEACONS] = @@ -118,8 +118,8 @@ const uint32 ZMBeaconLoseH[ZM_NUM_BEACONS] = const go_type ZMCapturePoints[ZM_NUM_BEACONS] = { - {182523,530,303.243f,6841.36f,40.1245f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f}, - {182522,530,336.466f,7340.26f,41.4984f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f} + {182523, 530, 303.243f, 6841.36f, 40.1245f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f}, + {182522, 530, 336.466f, 7340.26f, 41.4984f, -1.58825f, 0.0f, 0.0f, 0.71325f, -0.700909f} }; enum OutdoorPvPZMWorldStates diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index f29eae06ad8..285a7e6ed81 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -204,7 +204,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustSummoned(Creature *summoned) @@ -212,11 +212,11 @@ public: if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell. - summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false); + summoned->CastSpell(summoned, SPELL_STOLEN_SOUL_VISUAL, false); summoned->SetDisplayId(soulmodel); summoned->setFaction(me->getFaction()); - if (Unit *pTarget = Unit::GetUnit(*me,soulholder)) + if (Unit *pTarget = Unit::GetUnit(*me, soulholder)) { CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); @@ -230,7 +230,7 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -259,14 +259,14 @@ public: if (StolenSoul_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - uint32 i = urand(1,2); + uint32 i = urand(1, 2); if (i == 1) DoScriptText(SAY_ROAR, me); else @@ -286,7 +286,7 @@ public: if (Ribbon_of_Souls_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index b893f22b328..5371d8493e3 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -79,7 +79,7 @@ public: { if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) { - summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false); + summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false); summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); summoned->AddUnitState(UNIT_STAT_ROOT); @@ -136,11 +136,11 @@ public: if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { FocusedTargetGUID = pTarget->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); + me->SummonCreature(ENTRY_FOCUS_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); // TODO: Find better way to handle emote // Emote diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 72f628c2988..42256b6a501 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -116,7 +116,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); DoZoneInCombat(); summons.DoZoneInCombat(); @@ -126,9 +126,9 @@ public: { if (summoned->GetEntry() == NPC_BEACON) { - summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false); + summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } @@ -142,7 +142,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -201,7 +201,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); - if (!urand(0,3)) + if (!urand(0, 3)) DoScriptText(SAY_SUMMON, me); DoCast(me, SPELL_ETHEREAL_BEACON, true); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 2345ae4c41b..586a8dcc96d 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -75,12 +75,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 6daae1372fa..5bafe396b0d 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -94,7 +94,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustDied(Unit* /*Killer*/) @@ -107,12 +107,12 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustSummoned(Creature *summoned) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(pTarget); } @@ -154,7 +154,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; @@ -162,7 +162,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; @@ -170,7 +170,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; @@ -178,7 +178,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; @@ -186,7 +186,7 @@ public: if (chainlightning_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); chainlightning_timer = 25000; @@ -229,7 +229,7 @@ public: if (flameshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 5000; @@ -237,7 +237,7 @@ public: if (flamebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; @@ -288,7 +288,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; @@ -296,7 +296,7 @@ public: if (arcanebuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; @@ -342,7 +342,7 @@ public: if (frostshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 5000; @@ -350,7 +350,7 @@ public: if (frostbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; @@ -397,7 +397,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; @@ -405,7 +405,7 @@ public: if (shadowbuffet_timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index d19b756a5c7..c7ea5523dac 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -115,7 +115,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustDied(Unit* /*Killer*/) @@ -128,7 +128,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void UpdateAI(const uint32 diff) @@ -155,9 +155,9 @@ public: //second top aggro target in normal, random target in heroic correct? if (IsHeroic()) - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); else - pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) DoCast(pTarget, SPELL_POLYMORPH); @@ -184,7 +184,7 @@ public: { DoScriptText(EMOTE_ARCANE_EXP, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); @@ -196,7 +196,7 @@ public: float Y = pTarget->GetPositionY(); float Z = pTarget->GetPositionZ(); - DoTeleportTo(X,Y,Z); + DoTeleportTo(X, Y, Z); DoCast(pTarget, SPELL_BLINK_TELEPORT); Blink = true; 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 a9e0c8224ea..55aca9695cd 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -78,7 +78,7 @@ public: { case DATA_IKISSDOOREVENT: if (data == DONE) - DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILLISECONDS); + DoUseDoorOrButton(m_uiIkissDoorGUID, DAY*IN_MILLISECONDS); break; case TYPE_ANZU_ENCOUNTER: AnzuEncounter = data; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index de106876d15..6be6824953c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -128,12 +128,12 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 984a55f2a44..17174439e58 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -93,7 +93,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -106,7 +106,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); @@ -138,7 +138,7 @@ public: { Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true); + pTarget->CastSpell(pTarget, SPELL_INCITE_CHAOS_B, true); } DoResetThreat(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 491e4798f54..c7954000934 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -51,7 +51,7 @@ EndScriptData */ #define MOB_VOID_PORTAL 19224 #define SPELL_VOID_PORTAL_VISUAL 33569 -float VorpilPosition[3] = {-252.8820f,-264.3030f,17.1f}; +float VorpilPosition[3] = {-252.8820f, -264.3030f, 17.1f}; float VoidPortalCoords[5][3] = { @@ -115,7 +115,7 @@ public: me->Kill(me); return; } - me->GetMotionMaster()->MoveFollow(Vorpil,0,0); + me->GetMotionMaster()->MoveFollow(Vorpil, 0, 0); if (me->IsWithinDist(Vorpil, 3)) { DoCast(me, SPELL_SACRIFICE, false); @@ -183,11 +183,11 @@ public: for (uint8 i = 0; i < 5; ++i) { Creature *Portal = NULL; - Portal = me->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000); + Portal = me->SummonCreature(MOB_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000); if (Portal) { PortalsGuid[i] = Portal->GetGUID(); - Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false); + Portal->CastSpell(Portal, SPELL_VOID_PORTAL_VISUAL, false); } } sumportals = true; @@ -212,8 +212,8 @@ public: void spawnVoidTraveler() { - int pos = urand(0,4); - me->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000); + int pos = urand(0, 4); + me->SummonCreature(MOB_VOID_TRAVELER, VoidPortalCoords[pos][0], VoidPortalCoords[pos][1], VoidPortalCoords[pos][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); if (!HelpYell) { DoScriptText(SAY_HELP, me); @@ -229,7 +229,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -243,7 +243,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); summonPortals(); if (pInstance) @@ -274,7 +274,7 @@ public: if (IsHeroic() && banish_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false); if (pTarget) { DoCast(pTarget, SPELL_BANISH); @@ -289,9 +289,9 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->getSource()) if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) - i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); + i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); - me->GetMap()->CreatureRelocation(me, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); + me->GetMap()->CreatureRelocation(me, VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0.0f); DoCast(me, SPELL_DRAW_SHADOWS, true); DoCast(me, SPELL_RAIN_OF_FIRE); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index c583349ca67..58859e0230d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -101,7 +101,7 @@ public: void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) - me->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); + me->DealDamage(pTarget, (pTarget->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } void UpdateAI(const uint32 diff) @@ -131,7 +131,7 @@ public: // Murmur's Touch if (MurmursTouch_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) DoCast(pTarget, SPELL_MURMURS_TOUCH); MurmursTouch_Timer = 25000 + rand()%10000; } else MurmursTouch_Timer -= diff; @@ -149,7 +149,7 @@ public: // Magnetic Pull if (MagneticPull_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { DoCast(pTarget, SPELL_MAGNETIC_PULL); @@ -166,7 +166,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) DoCast(pTarget, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; @@ -175,7 +175,7 @@ public: // Sonic Shock if (SonicShock_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false)) if (pTarget->isAlive()) DoCast(pTarget, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; @@ -189,7 +189,7 @@ public: { std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid())) if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) { me->TauntApply(pTarget); 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 72622bb7c10..5558a98f559 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -108,7 +108,7 @@ public: if (creature->isAlive()) { ++m_uiFelOverseerCount; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.", m_uiFelOverseerCount); } break; } @@ -133,7 +133,7 @@ public: --m_uiFelOverseerCount; if (m_uiFelOverseerCount) - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.", m_uiFelOverseerCount); else { m_auiEncounter[1] = DONE; diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index b2a7ff4287f..d8c389eef1a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -114,7 +114,7 @@ public: Phase1 = true; me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } void EnterCombat(Unit * /*who*/) @@ -127,7 +127,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -218,7 +218,7 @@ public: if (EnrageTimer <= diff) { DoCast(me, SPELL_BERSERK); - DoScriptText(RAND(SAY_ENRAGE1,SAY_ENRAGE2), me); + DoScriptText(RAND(SAY_ENRAGE1, SAY_ENRAGE2), me); } else EnrageTimer -= diff; } @@ -289,7 +289,7 @@ public: DoModifyThreatPercent(pTarget, -100); me->AddThreat(pTarget, 50000000.0f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); // If VMaps are disabled, this spell can call the whole instance DoCast(me, SPELL_INSIGNIFIGANCE, true); DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true); @@ -301,7 +301,7 @@ public: //Cast this without triggered so that it appears in combat logs and shows visual. DoCast(me, SPELL_FEL_RAGE_SELF); - DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me); + DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); AcidGeyserTimer = 1000; PhaseChangeTimer = 30000; @@ -320,7 +320,7 @@ public: EjectTimer += 2000; PhaseChangeTimer = 60000; me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } } else PhaseChangeTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 3c3752c7c0b..d357faee386 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -259,17 +259,17 @@ static const Yells Conversation[22] = {0, "", AKAMA, 2000, 15, true}, {11466, "You are not prepared!", ILLIDAN_STORMRAGE, 3000, 406, true}, {0, "", EMPTY, 1000, 0, true}, - {0, "", EMPTY, 0, 0, false},//9 + {0, "", EMPTY, 0, 0, false}, //9 {11476, "Is this it, mortals? Is this all the fury you can muster?", ILLIDAN_STORMRAGE, 8000, 0, true}, {11491, "Their fury pales before mine, Illidan. We have some unsettled business between us.", MAIEV_SHADOWSONG, 8000, 5, true}, {11477, "Maiev... How is this even possible?", ILLIDAN_STORMRAGE, 5000, 1, true}, {11492, "Ah... my long hunt is finally over. Today, Justice will be done!", MAIEV_SHADOWSONG, 8000, 15, true}, - {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false},//14 - {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true},//15 + {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false}, //14 + {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true}, //15 {11478, "You have won... Maiev...but the huntress... is nothing...without the hunt... you... are nothing... without me..", ILLIDAN_STORMRAGE, 30000, 65, true}, // Emote dead for now. Kill him later {11497, "He is right. I feel nothing... I am nothing... Farewell, champions.", MAIEV_SHADOWSONG, 9000, 0, true}, {11498, "", MAIEV_SHADOWSONG, 5000, 0, true}, - {11498, "", EMPTY, 1000, 0, true},//19 Maiev disappear + {11498, "", EMPTY, 1000, 0, true}, //19 Maiev disappear {11387, "The Light will fill these dismal halls once again. I swear it.", AKAMA, 8000, 0, true}, {0, "", EMPTY, 1000, 0, false}//21 }; @@ -306,14 +306,14 @@ static const Locations HoverPosition[4]= static const Locations GlaivePosition[4]= { {695.105f, 305.303f, 354.256f}, - {659.338f, 305.303f, 354.256f},//the distance between two glaives is 36 + {659.338f, 305.303f, 354.256f}, //the distance between two glaives is 36 {700.105f, 305.303f, 354.256f}, {664.338f, 305.303f, 354.256f} }; static const Locations EyeBlast[2]= { - {677.0f, 350.0f, 354.0f},//start point, pass through glaive point + {677.0f, 350.0f, 354.0f}, //start point, pass through glaive point {677.0f, 260.0f, 354.0f} }; @@ -350,7 +350,7 @@ static const Animation DemonTransformation[10]= { {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, true}, {SPELL_DEMON_TRANSFORM_2, SPELL_DEMON_TRANSFORM_1, 4000, 0, 0, 6, true}, - {0, 0, 3000, 1073741824, 21322, 6, false},//stunned, cannot cast demon form + {0, 0, 3000, 1073741824, 21322, 6, false}, //stunned, cannot cast demon form {SPELL_DEMON_TRANSFORM_3, SPELL_DEMON_TRANSFORM_2, 3500, 0, 0, 6, false}, {SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 4, false}, {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, false}, @@ -568,7 +568,7 @@ public: { if (victim == me) return; // TODO: Find better way to handle emote - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: me->MonsterYell(SAY_KILL1, LANG_UNIVERSAL, victim->GetGUID()); @@ -1655,8 +1655,8 @@ public: break; case 2: // spirit help DoCast(Channel, SPELL_AKAMA_DOOR_CHANNEL); - Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false); - Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false); + Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false); + Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false); Timer = 5000; break; case 3: //open the gate @@ -1991,7 +1991,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence() { Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); Maiev->setDeathState(JUST_DIED); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } break; case 21: // Kill ourself. @@ -2218,7 +2218,7 @@ public: if (!me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND) && !me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) { - if (Creature* illidan = Unit::GetCreature((*me),IllidanGUID))//summon only in 1. phase + if (Creature* illidan = Unit::GetCreature((*me), IllidanGUID))//summon only in 1. phase if (CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL) me->CastSpell(me->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index c996a3ea35a..6eb6bb620c8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -64,7 +64,7 @@ uint32 PrismaticAuras[]= struct Locations { - float x,y,z; + float x, y, z; }; static Locations TeleportPoint[]= @@ -146,7 +146,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -235,7 +235,7 @@ public: TeleportPlayers(); - DoScriptText(RAND(SAY_SPELL2,SAY_SPELL3), me); + DoScriptText(RAND(SAY_SPELL2, SAY_SPELL3), me); FatalAttractionExplodeTimer = 2000; FatalAttractionTimer = 40000 + rand()%31 * 1000; } else FatalAttractionTimer -= diff; @@ -292,7 +292,7 @@ public: //Random taunts if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_TAUNT1,SAY_TAUNT2,SAY_TAUNT3), me); + DoScriptText(RAND(SAY_TAUNT1, SAY_TAUNT2, SAY_TAUNT3), me); RandomYellTimer = 60000 + rand()%91 * 1000; } else RandomYellTimer -= diff; 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 732f35c22a7..ae4d9790fca 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -88,7 +88,7 @@ EndScriptData */ struct Position2d { - float x,y; + float x, y; }; static Position2d Coords[]= @@ -294,7 +294,7 @@ public: MergeThreatList(Essence); Essence->RemoveAllAuras(); Essence->DeleteThreatList(); - Essence->GetMotionMaster()->MoveFollow(me,0.0f,0.0f); + Essence->GetMotionMaster()->MoveFollow(me, 0.0f, 0.0f); } else return; } break; @@ -302,7 +302,7 @@ public: Timer = 1500; if (Essence->IsWithinDistInMap(me, 10)) { - Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE,374); //rotate and disappear + Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, 374); //rotate and disappear Timer = 2000; me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } @@ -325,7 +325,7 @@ public: DoScriptText(DESI_SAY_AFTER, Essence); } Essence->DespawnOrUnsummon(); - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); EssenceGUID = 0; SoulCount = 0; SoulDeathCount = 0; @@ -406,7 +406,7 @@ public: { damage = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->Yell(SUFF_SAY_RECAP,LANG_UNIVERSAL,0); + me->Yell(SUFF_SAY_RECAP, LANG_UNIVERSAL, 0); DoScriptText(SUFF_SAY_RECAP, me); } } @@ -426,7 +426,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SUFF_SAY_SLAY1,SUFF_SAY_SLAY2,SUFF_SAY_SLAY3), me); + DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me); } void CastFixate() @@ -450,7 +450,7 @@ public: if (pTarget) pTarget->CastSpell(me, SPELL_FIXATE_TAUNT, true); DoResetThreat(); - me->AddThreat(pTarget,1000000); + me->AddThreat(pTarget, 1000000); } void UpdateAI(const uint32 diff) @@ -555,7 +555,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(DESI_SAY_SLAY1,DESI_SAY_SLAY2,DESI_SAY_SLAY3), me); + DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me); } void UpdateAI(const uint32 diff) @@ -634,7 +634,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(ANGER_SAY_FREED,ANGER_SAY_FREED2), me); + DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me); DoZoneInCombat(); DoCast(me, AURA_OF_ANGER, true); @@ -647,7 +647,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(ANGER_SAY_SLAY1,ANGER_SAY_SLAY2), me); + DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me); } void UpdateAI(const uint32 diff) 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 f7f31ca08c1..3a8f367bd43 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -173,7 +173,7 @@ public: Creature* Shade = Unit::GetCreature((*me), ShadeGUID); if (Shade && Shade->isAlive() && me->isAlive()) { - if (me->IsWithinDist(Shade, 20,false)) + if (me->IsWithinDist(Shade, 20, false)) { me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveIdle(); @@ -208,7 +208,7 @@ public: AkamaGUID = pInstance ? pInstance->GetData64(DATA_AKAMA_SHADE) : 0; me->setActive(true);//if view distance is too low me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } InstanceScript* pInstance; @@ -381,7 +381,7 @@ public: void FindChannelers() { std::list<Creature*> ChannelerList; - me->GetCreatureListWithEntryInGrid(ChannelerList,CREATURE_CHANNELER,50.0f); + me->GetCreatureListWithEntryInGrid(ChannelerList, CREATURE_CHANNELER, 50.0f); if (!ChannelerList.empty()) { @@ -437,7 +437,7 @@ public: if (Creature* Akama = Unit::GetCreature(*me, AkamaGUID)) { float x, y, z; - Akama->GetPosition(x,y,z); + Akama->GetPosition(x, y, z); // They move towards AKama Defender->GetMotionMaster()->MovePoint(0, x, y, z); Defender->AI()->AttackStart(Akama); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 5ff1a565f33..fd741088ecc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -73,7 +73,7 @@ public: me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm())); me->GetMotionMaster()->MovePoint(0, x, y, z); me->SetVisible(false); - me->CastSpell(me,SPELL_MOLTEN_FLAME,true); + me->CastSpell(me, SPELL_MOLTEN_FLAME, true); } }; @@ -138,7 +138,7 @@ public: events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE); me->SetSpeed(MOVE_RUN, 1.2f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } else { @@ -147,7 +147,7 @@ public: events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE); me->SetSpeed(MOVE_RUN, 0.9f); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); - me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); } DoResetThreat(); DoZoneInCombat(); @@ -232,7 +232,7 @@ public: if (pTarget) { //DoCast(pTarget, SPELL_VOLCANIC_SUMMON);//movement bugged - me->SummonCreature(CREATURE_VOLCANO,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + me->SummonCreature(CREATURE_VOLCANO, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); DoScriptText(EMOTE_GROUND_CRACK, me); events.DelayEvents(1500, GCD_CAST); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 7ccf85bc821..4153c4c234f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -288,7 +288,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -302,7 +302,7 @@ public: float CalculateRandomLocation(float Loc, uint32 radius) { float coord = Loc; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: coord += rand()%radius; @@ -345,8 +345,8 @@ public: Ghost = Unit::GetUnit((*me), GhostGUID); if (Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH)) { - /*float x,y,z; - Ghost->GetPosition(x,y,z); + /*float x, y, z; + Ghost->GetPosition(x, y, z); Creature* control = me->SummonCreature(CREATURE_GHOST, x, y, z, 0, TEMPSUMMON_TIMED_DESAWN, 30000); if (control) { @@ -458,7 +458,7 @@ public: if (pTarget) { - DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me); + DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); DoCast(pTarget, SPELL_INCINERATE); IncinerateTimer = 20000 + rand()%31 * 1000; } @@ -491,7 +491,7 @@ public: if (RandomYellTimer <= diff) { - DoScriptText(RAND(SAY_SPELL1,SAY_SPELL2), me); + DoScriptText(RAND(SAY_SPELL1, SAY_SPELL2), me); RandomYellTimer = 50000 + rand()%51 * 1000; } else RandomYellTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 299fa50adf4..fb8711ec7ac 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -189,13 +189,13 @@ public: SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) DoCast(*i, 39835, true); - events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST); + events.ScheduleEvent(EVENT_NEEDLE, urand(15000, 25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); return; } case EVENT_YELL: DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me); - events.ScheduleEvent(EVENT_YELL, urand(25000,100000), GCD_YELL); + events.ScheduleEvent(EVENT_YELL, urand(25000, 100000), GCD_YELL); events.DelayEvents(15000, GCD_YELL); break; } diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 3b44f115b93..0ae6d62e175 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -326,7 +326,7 @@ public: if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE)))) VoiceTrigger->DealDamage(VoiceTrigger, VoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE); - //me->SummonCreature(AKAMAID,746.466980f,304.394989f,311.90208f,6.272870f,TEMPSUMMON_DEAD_DESPAWN,0); + //me->SummonCreature(AKAMAID, 746.466980f, 304.394989f, 311.90208f, 6.272870f, TEMPSUMMON_DEAD_DESPAWN, 0); } me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; @@ -518,7 +518,7 @@ public: void CastAuraOnCouncil() { uint32 spellid = 0; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: spellid = SPELL_DEVOTION_AURA; break; case 1: spellid = SPELL_CHROMATIC_AURA; break; @@ -540,7 +540,7 @@ public: { if (Unit* pUnit = SelectCouncilMember()) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD); break; case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break; @@ -570,7 +570,7 @@ public: if (SealTimer <= diff) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoCast(me, SPELL_SEAL_OF_COMMAND); break; case 1: DoCast(me, SPELL_SEAL_OF_BLOOD); break; @@ -650,7 +650,7 @@ public: { DoCast(me, SPELL_DAMPEN_MAGIC); Cooldown = 1000; - DampenMagicTimer = 67200; // almost 1,12 minutes + DampenMagicTimer = 67200; // almost 1, 12 minutes ArcaneBoltTimer += 1000; // Give the Mage some time to spellsteal Dampen. } else DampenMagicTimer -= diff; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 1a7d30baa65..3770dabd8c7 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -164,24 +164,24 @@ public: 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; + if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break; case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) - if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; case 185478: ShadeOfAkamaDoor = go->GetGUID();break; case 185480: CommonDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; case 186153: TeronDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break; case 185892: GuurtogDoor = go->GetGUID(); - if (m_auiEncounter[4] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[4] == DONE)HandleGameObject(0, true, go);break; case 185479: TempleDoor = go->GetGUID(); - if (m_auiEncounter[5] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[5] == DONE)HandleGameObject(0, true, go);break; case 185482: MotherDoor = go->GetGUID(); - if (m_auiEncounter[6] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[6] == DONE)HandleGameObject(0, true, go);break; case 185481: CouncilDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; case 186152: SimpleDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break; case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit 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 201fa46bb02..b5e0120d004 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -201,7 +201,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*killer*/) @@ -432,7 +432,7 @@ public: pet = true; //uint32 spell_id; uint32 pet_id; - if (!urand(0,1)) + if (!urand(0, 1)) { //spell_id = SPELL_SUMMON_FATHOM_LURKER; pet_id = CREATURE_FATHOM_LURKER; @@ -443,8 +443,8 @@ public: pet_id = CREATURE_FATHOM_SPOREBAT; } //DoCast(me, spell_id, true); - Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Creature *Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (Pet && pTarget) { Pet->AI()->AttackStart(pTarget); 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 153bb9e5a66..9c79808b589 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 @@ -137,18 +137,18 @@ public: void SummonBeams() { - Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0); + Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -258.333f, -356.34f, 22.0499f, 5.90835f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (beamer) { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->CastSpell(me, SPELL_BLUE_BEAM, true); beamer->SetDisplayId(11686); //invisible beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[0]=beamer->GetGUID(); } - beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0); + beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (beamer) { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->CastSpell(me, SPELL_BLUE_BEAM, true); beamer->SetDisplayId(11686); //invisible beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[1]=beamer->GetGUID(); @@ -158,7 +158,7 @@ public: { for (uint8 i=0; i<2; ++i) { - Creature* mob = Unit::GetCreature(*me,beams[i]); + Creature* mob = Unit::GetCreature(*me, beams[i]); if (mob) { mob->setDeathState(DEAD); @@ -178,11 +178,11 @@ public: { if (CorruptedForm) { - DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me); + DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me); } else { - DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me); + DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me); } } @@ -191,13 +191,13 @@ public: if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true); Summons.Summon(summoned); } if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN) { summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true); Summons.Summon(summoned); } } 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 fadd533c65a..f9879dee03a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -228,7 +228,7 @@ public: } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -241,7 +241,7 @@ public: void StartEvent() { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3, SAY_AGGRO4), me); Phase = 1; @@ -301,7 +301,7 @@ public: void CastShootOrMultishot() { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: //Shoot @@ -316,7 +316,7 @@ public: } if (rand()%3) { - DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me); + DoScriptText(RAND(SAY_BOWSHOT1, SAY_BOWSHOT2), me); } } @@ -601,8 +601,8 @@ public: void Reset() { - me->SetSpeed(MOVE_WALK,0.6f);//walk - me->SetSpeed(MOVE_RUN,0.6f);//run + me->SetSpeed(MOVE_WALK, 0.6f);//walk + me->SetSpeed(MOVE_RUN, 0.6f);//run move = 0; phase = 1; @@ -618,7 +618,7 @@ public: } else { - if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z)) + if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(x, y, z)) { x = ElementWPPos[i][0]; y = ElementWPPos[i][1]; @@ -647,7 +647,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); if (phase == 1) me->GetMotionMaster()->MovePoint(0, x, y, z); - if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f)) + if (phase == 1 && me->IsWithinDist3d(x, y, z, 0.1f)) phase = 2; if (phase == 2) { @@ -676,7 +676,7 @@ public: }; //Tainted Elemental -//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental +//This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental class mob_tainted_elemental : public CreatureScript { public: @@ -812,7 +812,7 @@ public: if (movement_timer <= diff) { uint32 rndpos = rand()%8; - me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); + me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); movement_timer = 6000; } else movement_timer -= diff; @@ -823,11 +823,11 @@ public: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { - Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (trig) { trig->setFaction(14); - trig->CastSpell(trig, SPELL_TOXIC_SPORES,true); + trig->CastSpell(trig, SPELL_TOXIC_SPORES, true); } } bolt_timer = 10000+rand()%5000; @@ -859,7 +859,7 @@ public: }; //Coilfang Elite -//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage +//It's an elite Naga mob with 170, 000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage class mob_coilfang_elite : public CreatureScript { public: 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 bf91825bae9..d8e3b1158e9 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,7 +96,7 @@ public: } void JustDied(Unit * /*victim*/) { - Unit* pUnit = Unit::GetUnit((*me),victimGUID); + Unit* pUnit = Unit::GetUnit((*me), victimGUID); if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } @@ -124,10 +124,10 @@ public: if (me->getVictim()->GetGUID() != victimGUID) { DoModifyThreatPercent(me->getVictim(), -100); - Unit* owner = Unit::GetUnit((*me),victimGUID); + Unit* owner = Unit::GetUnit((*me), victimGUID); if (owner && owner->isAlive()) { - me->AddThreat(owner,999999); + me->AddThreat(owner, 999999); AttackStart(owner); } else if (owner && owner->isDead()) { @@ -172,7 +172,7 @@ public: { boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) { - c->GetPosition(x,y,z); + c->GetPosition(x, y, z); pInstance = c->GetInstanceScript(); Demon = 0; @@ -195,7 +195,7 @@ public: bool DemonForm; bool IsFinalForm; bool EnrageUsed; - float x,y,z; + float x, y, z; uint64 InnderDemon[5]; uint32 InnerDemon_Count; @@ -233,7 +233,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i])) + if (Creature *add = Unit::GetCreature(*me, SpellBinderGUID[i])) add->DisappearAndDie(); float nx = x; @@ -242,7 +242,7 @@ public: if (i == 0) {nx += 10; ny -= 5; o=2.5f;} if (i == 1) {nx -= 8; ny -= 7; o=0.9f;} if (i == 2) {nx -= 3; ny += 9; o=5.0f;} - Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0); + Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0); if (binder) SpellBinderGUID[i] = binder->GetGUID(); @@ -282,7 +282,7 @@ public: uint8 AliveChannelers = 0; for (uint8 i = 0; i < 3; ++i) { - Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]); + Unit *add = Unit::GetUnit(*me, SpellBinderGUID[i]); if (add && add->isAlive()) ++AliveChannelers; } @@ -374,11 +374,11 @@ public: if (DemonForm) { - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); } else { - DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me); + DoScriptText(RAND(SAY_NIGHTELF_SLAY1, SAY_NIGHTELF_SLAY2, SAY_NIGHTELF_SLAY3), me); } } @@ -425,7 +425,7 @@ public: { DoResetThreat(); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, newTarget->GetPositionX(), newTarget->GetPositionY(), newTarget->GetPositionZ()); } Whirlwind_Timer = 2000; } else Whirlwind_Timer -= diff; @@ -474,7 +474,7 @@ public: if (SwitchToDemon_Timer <= diff) { //switch to demon form - me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0); + me->RemoveAurasDueToSpell(SPELL_WHIRLWIND, 0); me->SetDisplayId(MODEL_DEMON); DoScriptText(SAY_SWITCH_TO_DEMON, me); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); @@ -621,7 +621,7 @@ public: if (victim->GetTypeId() != TYPEID_PLAYER) return; - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -760,7 +760,7 @@ public: if (Mindblast_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index b05ed6ff25e..67cb8797593 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -239,7 +239,7 @@ public: if (SpoutTimer <= diff) { - me->MonsterTextEmote(EMOTE_SPOUT,0,true); + me->MonsterTextEmote(EMOTE_SPOUT, 0, true); me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); SpoutTimer = 45000; @@ -279,7 +279,7 @@ public: Map::PlayerList const &PlayerList = pMap->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2),i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) + if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water } } @@ -299,7 +299,7 @@ public: if (GeyserTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -311,7 +311,7 @@ public: { if (WaterboltTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget && me->getVictim()) pTarget = me->getVictim(); if (pTarget) @@ -333,7 +333,7 @@ public: me->InterruptNonMeleeSpells(false);//shouldn't be any me->RemoveAllAuras(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); + me->RemoveFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED); DoCast(me, SPELL_EMERGE, true); Spawned = false; SpoutTimer = 3000; // directly cast Spout after emerging! @@ -357,8 +357,8 @@ public: { Creature* Summoned; if (i < 6) - Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Summoned) Summons.Summon(Summoned); @@ -457,7 +457,7 @@ public: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; if (pTarget) - me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true); + me->CastCustomSpell(pTarget, SPELL_SHOOT, &bp0, NULL, NULL, true); ShootBowTimer = 4000+rand()%5000; MultiShotTimer += 1500;//add global cooldown } else ShootBowTimer -= diff; 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 cf228240c27..62b41cd4c0f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -137,7 +137,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -183,7 +183,7 @@ public: } else { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me); for (uint8 i = 0; i < 10; ++i) { @@ -234,7 +234,7 @@ public: } } - DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me); + DoScriptText(RAND(SAY_SUMMON_BUBL1, SAY_SUMMON_BUBL2), me); DoScriptText(EMOTE_WATERY_GRAVE, me); WateryGrave_Timer = 30000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 271a1a0a02f..8dd2db54e75 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -143,16 +143,16 @@ class instance_serpent_shrine : public InstanceMapScript if (!pPlayer->HasAura(SPELL_SCALDINGWATER)) { - pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true); + pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER, true); } } else if (Water == WATERSTATE_FRENZY) { //spawn frenzy if (DoSpawnFrenzy) { - if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000)) + if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000)) { - frenzy->Attack(pPlayer,false); + frenzy->Attack(pPlayer, false); frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); } DoSpawnFrenzy = false; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index a8d7c1ce0b7..dcc88ba5d78 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -89,12 +89,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (pInstance) pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); @@ -108,12 +108,12 @@ public: //LightningCloud_Timer if (LightningCloud_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LIGHTNING_CLOUD); LightningCloud_Timer = 15000+rand()%10000; @@ -122,7 +122,7 @@ public: //LungBurst_Timer if (LungBurst_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_LUNG_BURST); LungBurst_Timer = 7000+rand()%5000; } else LungBurst_Timer -=diff; @@ -130,12 +130,12 @@ public: //EnvelopingWinds_Timer if (EnvelopingWinds_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); //cast twice in Heroic mode if (IsHeroic()) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 10000+rand()%5000; } else EnvelopingWinds_Timer -=diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index f57d8cb25e9..6781e3562c2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -98,12 +98,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (pInstance) pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); @@ -114,14 +114,14 @@ public: { DoScriptText(SAY_MECHANICS, me); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } void UpdateAI(const uint32 diff) @@ -137,7 +137,7 @@ public: if (Saw_Blade_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_SAW_BLADE); else DoCast(me->getVictim(), SPELL_SAW_BLADE); @@ -248,7 +248,7 @@ public: else { //me->GetMotionMaster()->MovementExpired(); - //me->GetMotionMaster()->MoveFollow(pMekgineer,0,0); + //me->GetMotionMaster()->MoveFollow(pMekgineer, 0, 0); } } } else Repair_Timer = 5000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index e4102fe6b11..d91750beaa3 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -87,14 +87,14 @@ public: DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true); if (pInstance) - pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); + pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS); } void DamageTaken(Unit * /*done_by*/, uint32 &damage) { if (me->GetHealth() <= damage) if (pInstance) - pInstance->SetData(TYPE_DISTILLER,DONE); + pInstance->SetData(TYPE_DISTILLER, DONE); } }; @@ -137,7 +137,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); if (pInstance) pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); @@ -145,7 +145,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void SpellHit(Unit * /*caster*/, const SpellEntry *spell) @@ -191,7 +191,7 @@ public: //Impale_Timer if (Impale_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; 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 41d8ab17e98..6eae132ebbc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -51,10 +51,10 @@ public: return false; if (go->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); + pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL); if (go->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL); return true; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 289cbc781a0..6ccce4646ba 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -75,7 +75,7 @@ public: if (Mushroom_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); else me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); @@ -85,7 +85,7 @@ public: if (AcidGeyser_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; } else AcidGeyser_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 92be08c2dae..d77cdcf69f0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -80,7 +80,7 @@ public: if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.push_back(summon->GetGUID()); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) summon->AI()->AttackStart(pTarget); else if (me->getVictim()) @@ -103,9 +103,9 @@ public: // Evade if too far if (check_Timer <= diff) { - float x,y,z,o; - me->GetHomePosition(x,y,z,o); - if (!me->IsWithinDist3d(x,y,z, 60)) + float x, y, z, o; + me->GetHomePosition(x, y, z, o); + if (!me->IsWithinDist3d(x, y, z, 60)) { EnterEvadeMode(); return; @@ -150,7 +150,7 @@ public: } if (Levitate_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { DoCast(pTarget, SPELL_LEVITATE); LevitatedTarget = pTarget->GetGUID(); @@ -163,7 +163,7 @@ public: // Chain Lightning if (ChainLightning_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 7000; } else ChainLightning_Timer -= diff; @@ -171,7 +171,7 @@ public: // Static Charge if (StaticCharge_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) DoCast(pTarget, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; } else StaticCharge_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 01b7546506f..dad5f356a1c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -106,7 +106,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -128,7 +128,7 @@ public: { if (pTarget->GetTypeId() == TYPEID_PLAYER) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break; case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break; @@ -197,7 +197,7 @@ public: // Hurtful Strike if (m_uiHurtfulStrike_Timer <= uiDiff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1); + Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget && me->IsWithinMeleeRange(me->getVictim())) DoCast(pTarget, SPELL_HURTFUL_STRIKE); @@ -221,7 +221,7 @@ public: // Cave In if (m_uiCaveIn_Timer <= uiDiff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index d48edfb8e07..4d835a680c0 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -170,7 +170,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -183,7 +183,7 @@ public: void AddDeath() { - DoScriptText(RAND(SAY_OGRE_DEATH1,SAY_OGRE_DEATH2,SAY_OGRE_DEATH3,SAY_OGRE_DEATH4), me); + DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me); } void EnterCombat(Unit *who) @@ -772,7 +772,7 @@ public: { pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); //15 yard radius minimum - if (pTarget && pTarget->IsWithinDist(me, 15,false)) + if (pTarget && pTarget->IsWithinDist(me, 15, false)) target_list.push_back(pTarget); pTarget = NULL; } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 2928a4f3d72..a21ce8473b7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -86,7 +86,7 @@ class boss_broggok : public CreatureScript summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID()); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index f2cdce78903..d65be72aec6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -60,11 +60,11 @@ enum eKelidan const float ShadowmoonChannelers[5][4]= { - {302.0f,-87.0f,-24.4f,0.157f}, - {321.0f,-63.5f,-24.6f,4.887f}, - {346.0f,-74.5f,-24.6f,3.595f}, - {344.0f,-103.5f,-24.5f,2.356f}, - {316.0f,-109.0f,-24.6f,1.257f} + {302.0f, -87.0f, -24.4f, 0.157f}, + {321.0f, -63.5f, -24.6f, 4.887f}, + {346.0f, -74.5f, -24.6f, 3.595f}, + {344.0f, -103.5f, -24.5f, 2.356f}, + {316.0f, -109.0f, -24.6f, 1.257f} }; class boss_kelidan_the_breaker : public CreatureScript @@ -124,7 +124,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void ChannelerEngaged(Unit* who) @@ -132,7 +132,7 @@ class boss_kelidan_the_breaker : public CreatureScript if (who && !addYell) { addYell = true; - DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me); + DoScriptText(RAND(SAY_ADD_AGGRO_1, SAY_ADD_AGGRO_2, SAY_ADD_AGGRO_3), me); } for (uint8 i=0; i<5; ++i) { @@ -175,7 +175,7 @@ class boss_kelidan_the_breaker : public CreatureScript { Creature *channeler = Unit::GetCreature(*me, Channelers[i]); if (!channeler || channeler->isDead()) - channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000); + channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); if (channeler) Channelers[i] = channeler->GetGUID(); else @@ -254,7 +254,7 @@ class boss_kelidan_the_breaker : public CreatureScript } if (IsHeroic()) - DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + DoTeleportAll(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); BurningNova_Timer = 20000+rand()%8000; Firenova_Timer= 5000; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index c1c86aad7e9..7f2b5f7bd78 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -80,7 +80,7 @@ class boss_the_maker : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); if (!pInstance) return; @@ -91,7 +91,7 @@ class boss_the_maker : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript if (ExplodingBreaker_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; } @@ -133,7 +133,7 @@ class boss_the_maker : public CreatureScript if (domination_timer_timer <= diff) { Unit *pTarget; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); DoCast(pTarget, SPELL_DOMINATION); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 04ad98a965d..6afbe18a78e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -92,7 +92,7 @@ class boss_omor_the_unscarred : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void KilledUnit(Unit* /*victim*/) @@ -107,7 +107,7 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_SUMMON, me); - if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(random); ++SummonedCount; @@ -162,7 +162,7 @@ class boss_omor_the_unscarred : public CreatureScript Unit* temp = NULL; if (me->IsWithinMeleeRange(me->getVictim())) temp = me->getVictim(); - else temp = SelectTarget(SELECT_TARGET_RANDOM,0); + else temp = SelectTarget(SELECT_TARGET_RANDOM, 0); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { @@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript { DoScriptText(SAY_CURSE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; @@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Shadowbolt_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) pTarget = me->getVictim(); 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 840d28065b4..6622c42827b 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 @@ -112,15 +112,15 @@ class boss_nazan : public CreatureScript { summoned->SetLevel(me->getLevel()); summoned->setFaction(me->getFaction()); - summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE,SPELL_SUMMON_LIQUID_FIRE_H),true); - summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true); + summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE, SPELL_SUMMON_LIQUID_FIRE_H), true); + summoned->CastSpell(summoned, SPELL_FIRE_NOVA_VISUAL, true); } } void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) { if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) - me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); + me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } void UpdateAI(const uint32 diff) @@ -130,16 +130,16 @@ class boss_nazan : public CreatureScript if (Fireball_Timer <= diff) { - if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true); - Fireball_Timer = urand(4000,7000); + Fireball_Timer = urand(4000, 7000); } else Fireball_Timer -= diff; if (flight) // phase 1 - the flight { - Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID); + Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20))) { flight = false; @@ -148,7 +148,7 @@ class boss_nazan : public CreatureScript me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); me->GetMotionMaster()->Clear(); - if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST,0)) + if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST, 0)) me->AI()->AttackStart(pVictim); DoStartMovement(me->getVictim()); DoScriptText(EMOTE, me); @@ -160,8 +160,8 @@ class boss_nazan : public CreatureScript if (Turn_Timer <= diff) { uint32 waypoint = (Fly_Timer/10000)%2; - if (!me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5)) - me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]); + if (!me->IsWithinDist3d(VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2], 5)) + me->GetMotionMaster()->MovePoint(0, VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2]); Turn_Timer = 10000; } else @@ -227,13 +227,13 @@ class boss_vazruden : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void KilledUnit(Unit* who) { if (who && who->GetEntry() != ENTRY_VAZRUDEN) - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* who) @@ -263,7 +263,7 @@ class boss_vazruden : public CreatureScript if (Revenge_Timer <= diff) { if (Unit *victim = me->getVictim()) - DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H)); + DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H)); Revenge_Timer = 5000; } else @@ -346,9 +346,9 @@ class boss_vazruden_the_herald : public CreatureScript { if (!summoned) { - if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000)) VazrudenGUID = Vazruden->GetGUID(); - if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000)) NazanGUID = Nazan->GetGUID(); summoned = true; me->SetVisible(false); @@ -405,10 +405,10 @@ class boss_vazruden_the_herald : public CreatureScript case 1: // go to the middle and begin the fight if (check <= diff) { - if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5)) + if (!me->IsWithinDist3d(VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 5)) { me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]); + me->GetMotionMaster()->MovePoint(0, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2]); check = 1000; } else @@ -439,7 +439,7 @@ class boss_vazruden_the_herald : public CreatureScript } else if (!lootSpawned) { - me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H),VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0); + me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0); me->SetLootRecipient(NULL); // don't think this is necessary.. //me->Kill(me); lootSpawned = true; @@ -475,14 +475,14 @@ class mob_hellfire_sentry : public CreatureScript void Reset() { - KidneyShot_Timer = urand(3000,7000); + KidneyShot_Timer = urand(3000, 7000); } void EnterCombat(Unit* /*who*/) {} void JustDied(Unit* who) { - if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150)) + if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 96d8e17c238..f1b21b1da69 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -80,7 +80,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void MoveInLineOfSight(Unit* who) @@ -106,7 +106,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { DoScriptText(SAY_SURGE, me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; 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 06b856cc31b..ba6969acc2c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -66,7 +66,7 @@ class instance_ramparts : public InstanceMapScript void SetData(uint32 uiType, uint32 uiData) { - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData); switch(uiType) { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 332cd1792b1..71c05cbf93a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -158,7 +158,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void DoTauntPeons() { - DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me); + DoScriptText(RAND(SAY_TAUNT_1, SAY_TAUNT_2, SAY_TAUNT_3), me); //TODO: kill the peons first IsIntroEvent = false; @@ -194,7 +194,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript IsIntroEvent = true; if (pInstance) - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } if (IsIntroEvent || !IsMainEvent) @@ -205,7 +205,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); } void JustSummoned(Creature *summoned) @@ -215,13 +215,13 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid? - summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true); - summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true); + summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -231,7 +231,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (!pInstance) return; - pInstance->SetData(TYPE_NETHEKURSE,DONE); + pInstance->SetData(TYPE_NETHEKURSE, DONE); pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true); } @@ -277,18 +277,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (ShadowFissure_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISSURE); - ShadowFissure_Timer = urand(7500,15000); + ShadowFissure_Timer = urand(7500, 15000); } else ShadowFissure_Timer -= diff; if (DeathCoil_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_DEATH_COIL); - DeathCoil_Timer = urand(15000,20000); + DeathCoil_Timer = urand(15000, 20000); } else DeathCoil_Timer -= diff; @@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript { if (pInstance->GetData64(DATA_NETHEKURSE)) { - Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)); + Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)); if (pKurse && me->IsWithinDist(pKurse, 45.0f)) { CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); @@ -350,7 +350,7 @@ class mob_fel_orc_convert : public CreatureScript if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) return; else - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS); } } } @@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) return; if (pInstance->GetData64(DATA_NETHEKURSE)) - if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE))) + if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE))) CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); } } 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 b02521d6136..69e8c12ac41 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -190,13 +190,13 @@ class boss_warbringer_omrogg : public CreatureScript void Reset() { - if (Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { pLeftHead->setDeathState(JUST_DIED); LeftHeadGUID = 0; } - if (Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID)) + if (Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID)) { pRightHead->setDeathState(JUST_DIED); RightHeadGUID = 0; @@ -221,8 +221,8 @@ class boss_warbringer_omrogg : public CreatureScript void DoYellForThreat() { - Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); - if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { iaggro = rand()%3; @@ -271,8 +271,8 @@ class boss_warbringer_omrogg : public CreatureScript void KilledUnit(Unit* /*victim*/) { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -297,8 +297,8 @@ class boss_warbringer_omrogg : public CreatureScript void JustDied(Unit* /*Killer*/) { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -317,8 +317,8 @@ class boss_warbringer_omrogg : public CreatureScript { Delay_Timer = 3500; - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID); if (!pLeftHead || !pRightHead) return; @@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ResetThreat_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoYellForThreat(); DoResetThreat(); 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 e7098b1ffe1..417eb865b4d 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 @@ -55,9 +55,9 @@ enum eCreatures #define TARGET_NUM 5 -float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8 -float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8 -float AddsEntrance[3] = {306.036f,-84.29f,1.93f}; +float AssassEntrance[3] = {275.136f, -84.29f, 2.3f}; // y -8 +float AssassExit[3] = {184.233f, -84.29f, 2.3f}; // y -8 +float AddsEntrance[3] = {306.036f, -84.29f, 1.93f}; class boss_warchief_kargath_bladefist : public CreatureScript { @@ -94,7 +94,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { removeAdds(); - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); summoned = 2; @@ -110,7 +110,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void JustSummoned(Creature *summoned) @@ -120,7 +120,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript case MOB_HEARTHEN_GUARD: case MOB_SHARPSHOOTER_GUARD: case MOB_REAVER_GUARD: - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0)); + summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); adds.push_back(summoned->GetGUID()); break; case MOB_SHATTERED_ASSASSIN: @@ -133,7 +133,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { if (victim->GetTypeId() == TYPEID_PLAYER) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } } @@ -166,11 +166,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript { for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) { - Unit* temp = Unit::GetUnit((*me),*itr); + Unit* temp = Unit::GetUnit((*me), *itr); if (temp && temp->isAlive()) { (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CAST_CRE(temp)->RemoveCorpse(); } } @@ -178,11 +178,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) { - Unit* temp = Unit::GetUnit((*me),*itr); + Unit* temp = Unit::GetUnit((*me), *itr); if (temp && temp->isAlive()) { (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CAST_CRE(temp)->RemoveCorpse(); } } @@ -190,10 +190,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript } void SpawnAssassin() { - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } void UpdateAI(const uint32 diff) @@ -223,7 +223,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { // stop bladedance InBlade = false; - me->SetSpeed(MOVE_RUN,2); + me->SetSpeed(MOVE_RUN, 2); me->GetMotionMaster()->MoveChase(me->getVictim()); Blade_Dance_Timer = 30000; Wait_Timer = 0; @@ -233,12 +233,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript else { //move in bladedance - float x,y,randx,randy; + float x, y, randx, randy; randx = 0.0f + rand()%40; randy = 0.0f + rand()%40; x = 210+ randx ; y = -60- randy ; - me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, x, y, me->GetPositionZ()); Wait_Timer = 0; } } @@ -256,7 +256,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript Wait_Timer = 1; InBlade = true; Blade_Dance_Timer = 0; - me->SetSpeed(MOVE_RUN,4); + me->SetSpeed(MOVE_RUN, 4); return; } else @@ -278,22 +278,22 @@ class boss_warchief_kargath_bladefist : public CreatureScript { for (uint8 i = 0; i < summoned; ++i) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } - if (urand(0,9) < 2) + if (urand(0, 9) < 2) ++summoned; - Summon_Assistant_Timer = urand(25000,35000); + Summon_Assistant_Timer = urand(25000, 35000); } else Summon_Assistant_Timer -= diff; @@ -303,7 +303,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript if (resetcheck_timer <= diff) { - uint32 tempx,tempy; + uint32 tempx, tempy; tempx = uint32(me->GetPositionX()); tempy = uint32(me->GetPositionY()); if (tempx > 255 || tempx < 205) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index a948ab70a34..7eef901f83e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -28,7 +28,7 @@ EndScriptData */ enum eSpells { - SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions + SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions SPELL_FLAME_QUILLS = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20% SPELL_REBIRTH = 34342, // Rebirth - beginning of second phase(after losing all health in phase 1) SPELL_REBIRTH_2 = 35369, // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2 @@ -291,7 +291,7 @@ class boss_alar : public CreatureScript if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) dist = 5.0f; WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f)); - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f); + me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f); me->StopMoving(); WaitEvent = WE_LAND; } @@ -343,7 +343,7 @@ class boss_alar : public CreatureScript } else { - if (urand(0,4)) // next platform + if (urand(0, 4)) // next platform { DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (cur_wp == 3) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 5d7fb7e9f35..d50ac198eff 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -145,7 +145,7 @@ class boss_high_astromancer_solarian : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me); } void JustDied(Unit * /*victim*/) @@ -180,7 +180,7 @@ class boss_high_astromancer_solarian : public CreatureScript float Portal_X(float radius) { - if (urand(0,1)) + if (urand(0, 1)) radius = -radius; return radius * (float)(rand()%100)/100.0f + CENTER_X; @@ -447,7 +447,7 @@ class mob_solarium_priest : public CreatureScript if (healTimer <= diff) { Unit *pTarget = NULL; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: if (pInstance) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 60b92956a34..95e6a52db2b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -236,7 +236,7 @@ struct advisorbase_ai : public ScriptedAI me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->ClearAllReactives(); - me->SetUInt64Value(UNIT_FIELD_TARGET,0); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -431,7 +431,7 @@ class boss_kaelthas : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustSummoned(Creature* pSummoned) @@ -798,7 +798,7 @@ class boss_kaelthas : public CreatureScript if (Phoenix_Timer <= diff) { DoCast(me, SPELL_PHOENIX_ANIMATION); - DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me); + DoScriptText(RAND(SAY_SUMMON_PHOENIX1, SAY_SUMMON_PHOENIX2), me); Phoenix_Timer = 60000; } @@ -909,7 +909,7 @@ class boss_kaelthas : public CreatureScript break; case 1: - DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me); + DoScriptText(RAND(SAY_GRAVITYLAPSE1, SAY_GRAVITYLAPSE2), me); // 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) @@ -1487,7 +1487,7 @@ class mob_phoenix_tk : public CreatureScript { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); - me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); + me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000); } void UpdateAI(const uint32 diff) @@ -1498,7 +1498,7 @@ class mob_phoenix_tk : public CreatureScript if (Cycle_Timer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. - uint32 dmg = urand(4500,5500); + uint32 dmg = urand(4500, 5500); if (me->GetHealth() > dmg) me->ModifyHealth(-int32(dmg)); Cycle_Timer = 2000; @@ -1553,7 +1553,7 @@ class mob_phoenix_egg_tk : public CreatureScript void JustSummoned(Creature* summoned) { summoned->AddThreat(me->getVictim(), 0.0f); - summoned->CastSpell(summoned,SPELL_REBIRTH,false); + summoned->CastSpell(summoned, SPELL_REBIRTH, false); } void UpdateAI(const uint32 diff) @@ -1563,7 +1563,7 @@ class mob_phoenix_egg_tk : public CreatureScript if (Rebirth_Timer <= diff) { - me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); + me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5000); Rebirth_Timer = 0; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index b463952f508..c26c2551a67 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -82,7 +82,7 @@ class boss_void_reaver : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit * /*victim*/) @@ -110,7 +110,7 @@ class boss_void_reaver : public CreatureScript if (Pounding_Timer <= diff) { DoCast(me->getVictim(), SPELL_POUNDING); - DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me); + DoScriptText(RAND(SAY_POUNDING1, SAY_POUNDING2), me); Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) } else @@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript pTarget = me->getVictim(); if (pTarget) - me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); + me->CastSpell(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget); ArcaneOrb_Timer = 3000; } else @@ -152,7 +152,7 @@ class boss_void_reaver : public CreatureScript DoCast(me->getVictim(), SPELL_KNOCK_AWAY); //Drop 25% aggro if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-25); + DoModifyThreatPercent(me->getVictim(), -25); KnockAway_Timer = 30000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 9dac1517444..2b575d2b499 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -83,7 +83,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -118,7 +118,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript if (rand()%2) return; - DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me); + DoScriptText(RAND(SAY_HAMMER_1, SAY_HAMMER_2), me); Jackhammer_Timer = 30000; } else diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index ba6318a4686..d82edd7391e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -98,7 +98,7 @@ class boss_nethermancer_sepethrea : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit* /*Killer*/) @@ -139,7 +139,7 @@ class boss_nethermancer_sepethrea : public CreatureScript { if (rand()%2) return; - DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me); + DoScriptText(RAND(SAY_DRAGONS_BREATH_1, SAY_DRAGONS_BREATH_2), me); } dragons_breath_Timer = 12000 + rand()%10000; } @@ -233,7 +233,7 @@ class mob_ragin_flames : public CreatureScript if (!onlyonce) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) me->GetMotionMaster()->MoveChase(pTarget); onlyonce = true; } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 6e06fd4920e..ecaf72d8567 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -100,7 +100,7 @@ class boss_pathaleon_the_calculator : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -129,8 +129,8 @@ class boss_pathaleon_the_calculator : public CreatureScript { for (uint8 i = 0; i < 3; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); - Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); if (pTarget && Wraith) Wraith->AI()->AttackStart(pTarget); } @@ -158,9 +158,9 @@ class boss_pathaleon_the_calculator : public CreatureScript if (Domination_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me); + DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me); DoCast(pTarget, SPELL_DOMINATION); } Domination_Timer = 25000 + rand()%5000; @@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript if (ArcaneMissiles_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_ARCANE_MISSILES); else DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 9db38aa3a0c..c67e70a8614 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -126,7 +126,7 @@ class npc_millhouse_manastorm : public CreatureScript void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit * /*victim*/) @@ -177,7 +177,7 @@ class npc_millhouse_manastorm : public CreatureScript break; case 7: if (pInstance) - pInstance->SetData(TYPE_WARDEN_2,DONE); + pInstance->SetData(TYPE_WARDEN_2, DONE); Init = true; break; } @@ -301,11 +301,11 @@ class npc_warden_mellichar : public CreatureScript EventProgress_Timer = 22000; Phase = 1; - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); DoCast(me, SPELL_TARGET_OMEGA); if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED); + pInstance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } void AttackStart(Unit* /*who*/) {} @@ -335,7 +335,7 @@ class npc_warden_mellichar : public CreatureScript if (pInstance) { - pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS); + pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); IsRunning = true; } @@ -375,23 +375,23 @@ class npc_warden_mellichar : public CreatureScript { case 2: DoCast(me, SPELL_TARGET_ALPHA); - pInstance->SetData(TYPE_WARDEN_1,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_1, IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); break; case 3: DoCast(me, SPELL_TARGET_BETA); - pInstance->SetData(TYPE_WARDEN_2,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_2, IN_PROGRESS); break; case 5: DoCast(me, SPELL_TARGET_DELTA); - pInstance->SetData(TYPE_WARDEN_3,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_3, IN_PROGRESS); break; case 6: DoCast(me, SPELL_TARGET_GAMMA); - pInstance->SetData(TYPE_WARDEN_4,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_4, IN_PROGRESS); break; case 7: - pInstance->SetData(TYPE_WARDEN_5,IN_PROGRESS); + pInstance->SetData(TYPE_WARDEN_5, IN_PROGRESS); break; } CanSpawn = true; @@ -423,46 +423,46 @@ class npc_warden_mellichar : public CreatureScript switch(Phase) { case 2: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 3: - me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 4: DoScriptText(YELL_RELEASE2B, me); break; case 5: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 6: - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; case 1: - me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); break; } break; case 7: - me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); DoScriptText(YELL_WELCOME, me); break; } @@ -540,7 +540,7 @@ class mob_zerekethvoidzone : public CreatureScript void Reset() { - me->SetUInt32Value(UNIT_NPC_FLAGS,0); + me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(16); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); 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 02c8c6bb4e5..040b1469130 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -89,7 +89,7 @@ class boss_harbinger_skyriss : public CreatureScript void Reset() { if (!Intro) - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); IsImage33 = false; IsImage66 = false; @@ -116,7 +116,7 @@ class boss_harbinger_skyriss : public CreatureScript { DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_HARBINGERSKYRISS,DONE); + pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE); } void JustSummoned(Creature *summon) @@ -138,7 +138,7 @@ class boss_harbinger_skyriss : public CreatureScript if (victim->GetEntry() == 21436) return; - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void DoSplit(uint32 val) @@ -173,18 +173,18 @@ class boss_harbinger_skyriss : public CreatureScript break; case 2: DoScriptText(SAY_AGGRO, me); - if (Unit *mellic = Unit::GetUnit(*me,pInstance->GetData64(DATA_MELLICHAR))) + if (Unit *mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR))) { //should have a better way to do this. possibly spell exist. mellic->setDeathState(JUST_DIED); mellic->SetHealth(0); - pInstance->SetData(TYPE_SHIELD_OPEN,IN_PROGRESS); + pInstance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS); } ++Intro_Phase; Intro_Timer = 3000; break; case 3: - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); Intro = true; break; } @@ -208,7 +208,7 @@ class boss_harbinger_skyriss : public CreatureScript if (MindRend_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_MIND_REND); else DoCast(me->getVictim(), SPELL_MIND_REND); @@ -223,9 +223,9 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), me); + DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); else DoCast(me->getVictim(), SPELL_FEAR); @@ -240,9 +240,9 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), me); + DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_DOMINATION); else DoCast(me->getVictim(), SPELL_DOMINATION); @@ -259,7 +259,7 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCasted(false)) return; - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index a5600475c85..eef84ad093e 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -30,17 +30,17 @@ EndScriptData */ enum eUnits { - CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318,//door opened when Wrath-Scryer Soccothrates dies - CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319,//door opened when Dalliah the Doomsayer dies - POD_ALPHA = 183961,//pod first boss wave - POD_BETA = 183963,//pod second boss wave - POD_DELTA = 183964,//pod third boss wave - POD_GAMMA = 183962,//pod fourth boss wave - POD_OMEGA = 183965,//pod fifth boss wave - WARDENS_SHIELD = 184802,// warden shield - SEAL_SPHERE = 184802,//shield 'protecting' mellichar - - MELLICHAR = 20904,//skyriss will kill this unit + CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies + CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319, //door opened when Dalliah the Doomsayer dies + POD_ALPHA = 183961, //pod first boss wave + POD_BETA = 183963, //pod second boss wave + POD_DELTA = 183964, //pod third boss wave + POD_GAMMA = 183962, //pod fourth boss wave + POD_OMEGA = 183965, //pod fifth boss wave + WARDENS_SHIELD = 184802, // warden shield + SEAL_SPHERE = 184802, //shield 'protecting' mellichar + + MELLICHAR = 20904, //skyriss will kill this unit }; /* Arcatraz encounters: 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 247100fcb43..4d031be1195 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 @@ -104,7 +104,7 @@ class boss_high_botanist_freywinn : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void JustDied(Unit* /*Killer*/) @@ -119,7 +119,7 @@ class boss_high_botanist_freywinn : public CreatureScript if (TreeForm_Timer <= diff) { - DoScriptText(RAND(SAY_TREE_1,SAY_TREE_2), me); + DoScriptText(RAND(SAY_TREE_1, SAY_TREE_2), me); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(true); @@ -146,7 +146,7 @@ class boss_high_botanist_freywinn : public CreatureScript { for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr) { - if (Unit *temp = Unit::GetUnit(*me,*itr)) + if (Unit *temp = Unit::GetUnit(*me, *itr)) { if (!temp->isAlive()) { @@ -179,7 +179,7 @@ class boss_high_botanist_freywinn : public CreatureScript return; } - /*if (me->HasAura(SPELL_TREE_FORM,0) || me->HasAura(SPELL_TRANQUILITY,0)) + /*if (me->HasAura(SPELL_TREE_FORM, 0) || me->HasAura(SPELL_TRANQUILITY, 0)) return;*/ //one random seedling every 5 secs, but not in tree form 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 4dc661b77d2..ac69e21a30b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -98,14 +98,14 @@ class mob_warp_splinter_treant : public CreatureScript { if (Unit *Warp = Unit::GetUnit(*me, WarpGuid)) { - if (me->IsWithinMeleeRange(Warp,2.5f)) + 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; } - me->GetMotionMaster()->MoveFollow(Warp,0,0); + me->GetMotionMaster()->MoveFollow(Warp, 0, 0); } check_Timer = 1000; } @@ -166,7 +166,7 @@ class boss_warp_splinter : public CreatureScript void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -182,12 +182,12 @@ class boss_warp_splinter : public CreatureScript float X = Treant_Spawn_Pos_X + TREANT_SPAWN_DIST * cos(angle); float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle); - float O = - me->GetAngle(X,Y); + float O = - me->GetAngle(X, Y); - if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000)) + if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); } - DoScriptText(RAND(SAY_SUMMON_1,SAY_SUMMON_2), me); + DoScriptText(RAND(SAY_SUMMON_1, SAY_SUMMON_2), me); } void UpdateAI(const uint32 diff) @@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript //Check for Arcane Volley if (Arcane_Volley_Timer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY,ARCANE_VOLLEY_H)); + DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H)); Arcane_Volley_Timer = 20000 + rand()%15000; } else diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp index 95ab6183c3f..0b8beb3edc9 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/blades_edge_mountains.cpp @@ -84,8 +84,8 @@ enum eNetherdrake SAY_NIHIL_1 = -1000169, //signed for 5955 SAY_NIHIL_2 = -1000170, //signed for 5955 SAY_NIHIL_3 = -1000171, //signed for 5955 - SAY_NIHIL_4 = -1000172, //signed for 20021, used by 20021,21817,21820,21821,21823 - SAY_NIHIL_INTERRUPT = -1000173, //signed for 20021, used by 20021,21817,21820,21821,21823 + SAY_NIHIL_4 = -1000172, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 + SAY_NIHIL_INTERRUPT = -1000173, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823 ENTRY_WHELP = 20021, ENTRY_PROTO = 21821, @@ -410,7 +410,7 @@ public: if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true) { - pGo->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); + pGo->SummonCreature(19963, 2943.40f, 4778.20f, 284.49f, 0.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); //reset global var obelisk_one = false; obelisk_two = false; diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index a841dacf9b5..d04a4b7b205 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -87,7 +87,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } void KilledUnit(Unit* victim) @@ -98,7 +98,7 @@ public: DoCast(me, SPELL_CAPTURESOUL); - DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); + DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index ba37b119623..a794690f04e 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -78,12 +78,12 @@ public: void KilledUnit(Unit* Victim) { - Victim->CastSpell(Victim,SPELL_MARK_DEATH,0); + Victim->CastSpell(Victim, SPELL_MARK_DEATH, 0); if (rand()%5) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); } void JustDied(Unit* /*Killer*/) @@ -100,9 +100,9 @@ public: { if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who)) { - if (who->HasAura(SPELL_MARK_DEATH,0)) + if (who->HasAura(SPELL_MARK_DEATH, 0)) { - who->CastSpell(who,SPELL_AURA_DEATH,1); + who->CastSpell(who, SPELL_AURA_DEATH, 1); } } } @@ -126,7 +126,7 @@ public: //Spell Overrun if (Overrun_Timer <= diff) { - DoScriptText(RAND(SAY_OVERRUN_1,SAY_OVERRUN_2), me); + DoScriptText(RAND(SAY_OVERRUN_1, SAY_OVERRUN_2), me); DoCast(me->getVictim(), SPELL_OVERRUN); Overrun_Timer = 25000 + rand()%15000; @@ -138,7 +138,7 @@ public: if (rand()%2) return; - DoScriptText(RAND(SAY_EARTHQUAKE_1,SAY_EARTHQUAKE_2), me); + DoScriptText(RAND(SAY_EARTHQUAKE_1, SAY_EARTHQUAKE_2), me); //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead if (InEnrage) @@ -152,7 +152,7 @@ public: if (Chain_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = me->getVictim(); diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 414efdc7fb5..496e813a3a4 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -212,7 +212,7 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { - pGo->SummonCreature(C_AERANAS,-1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); + pGo->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; } @@ -438,7 +438,7 @@ public: case 27: DoScriptText(SAY_ELF_COMPLETE, me, pPlayer); // Award quest credit - pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,me); + pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me); break; } } @@ -498,13 +498,13 @@ public: if (uiType != POINT_MOTION_TYPE || uiId != 1) return; - if (Creature* pHelboar = me->GetCreature(*me,uiHelboarGUID)) + if (Creature* pHelboar = me->GetCreature(*me, uiHelboarGUID)) { pHelboar->RemoveCorpse(); DoCast(SPELL_SUMMON_POO); if (Player* pOwner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) - me->GetMotionMaster()->MoveFollow(pOwner,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(pOwner, 0.0f, 0.0f); } } @@ -517,7 +517,7 @@ public: if (pHelboar->GetGUID() != uiHelboarGUID && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && !me->FindCurrentSpellBySpellId(SPELL_SUMMON_POO)) { uiHelboarGUID = pHelboar->GetGUID(); - me->GetMotionMaster()->MovePoint(1,pHelboar->GetPositionX(),pHelboar->GetPositionY(),pHelboar->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, pHelboar->GetPositionX(), pHelboar->GetPositionY(), pHelboar->GetPositionZ()); } } uiCheckTimer = 5000; diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index de2f215bbec..da8b2b491b5 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -73,9 +73,9 @@ public: float y = me->GetPositionY(); float z = me->GetPositionZ(); - Hitter->SummonCreature(18181,x+(0.7f * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5f *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + Hitter->SummonCreature(18181, x+(0.7f * (rand()%30)), y+(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + Hitter->SummonCreature(18181, x+(rand()%5), y-(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); + Hitter->SummonCreature(18181, x-(rand()%5), y+(0.5f *(rand()%60)), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); me->setDeathState(CORPSE); Spawn = true; } @@ -208,7 +208,7 @@ public: if (!me->IsStandState()) me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(RAND(LUMP_SAY0,LUMP_SAY1), me); + DoScriptText(RAND(LUMP_SAY0, LUMP_SAY1), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index d9ffcf311d8..6bd250dd171 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Netherstorm SD%Complete: 80 -SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299,10321,10322,10323,10329,10330,10338,10365(Shutting Down Manaforge), 10198, 10191 +SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299, 10321, 10322, 10323, 10329, 10330, 10338, 10365(Shutting Down Manaforge), 10198, 10191 SDCategory: Netherstorm EndScriptData */ @@ -38,7 +38,7 @@ EndContentData */ ## npc_manaforge_control_console ######*/ -//used by 20209,20417,20418,20440, signed for 20209 +//used by 20209, 20417, 20418, 20440, signed for 20209 enum eManaforgeConsoleData { EMOTE_START = -1000211, @@ -105,7 +105,7 @@ public: //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. if (spell->Id == SPELL_INTERRUPT_1) - DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL); + DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL); }*/ void JustDied(Unit* /*killer*/) @@ -114,7 +114,7 @@ public: if (someplayer) { - Unit* p = Unit::GetUnit((*me),someplayer); + Unit* p = Unit::GetUnit((*me), someplayer); if (p && p->GetTypeId() == TYPEID_PLAYER) { switch(me->GetEntry()) @@ -141,7 +141,7 @@ public: if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole)) + if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } } @@ -153,48 +153,48 @@ public: case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68f,4162.55f,164.00f,1.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2927.36f,4212.97f,164.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2933.68f, 4162.55f, 164.00f, 1.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2927.36f, 4212.97f, 164.00f); } else { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36f,4212.97f,164.00f,4.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2933.68f,4162.55f,164.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2927.36f, 4212.97f, 164.00f, 4.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2933.68f, 4162.55f, 164.00f); } Wave_Timer = 30000; break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21f,2765.26f,134.49f,3.93f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2424.21f,2740.15f,133.81f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86f,2731.85f,134.53f,1.31f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2435.37f,2766.04f,133.81f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2445.21f, 2765.26f, 134.49f, 3.93f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2424.21f, 2740.15f, 133.81f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2429.86f, 2731.85f, 134.53f, 1.31f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2435.37f, 2766.04f, 133.81f); Wave_Timer = 20000; break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80f,2205.36f,165.37f,3.74f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2985.15f,2197.32f,164.79f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91f,2191.20f,165.32f,0.22f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2060.01f,2185.27f,164.67f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2986.80f, 2205.36f, 165.37f, 3.74f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2985.15f, 2197.32f, 164.79f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2952.91f, 2191.20f, 165.32f, 0.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2060.01f, 2185.27f, 164.67f); Wave_Timer = 15000; break; case ENTRY_ARA_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_ARA_TECH,4035.11f,4038.97f,194.27f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); - add = me->SummonCreature(ENTRY_ARA_TECH,4033.66f,4036.79f,194.28f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); - add = me->SummonCreature(ENTRY_ARA_TECH,4037.13f,4037.30f,194.23f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4035.11f, 4038.97f, 194.27f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4033.66f, 4036.79f, 194.28f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH, 4037.13f, 4037.30f, 194.23f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f); } else { - add = me->SummonCreature(ENTRY_ARA_TECH,3099.59f,4049.30f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); - add = me->SummonCreature(ENTRY_ARA_TECH,3999.72f,4046.75f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); - add = me->SummonCreature(ENTRY_ARA_TECH,3996.81f,4048.26f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3099.59f, 4049.30f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3999.72f, 4046.75f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH, 3996.81f, 4048.26f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f); } Wave_Timer = 15000; break; @@ -205,30 +205,30 @@ public: switch(pCreature->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); - if (add) add->GetMotionMaster()->MovePoint(0,2927.49f,4192.81f,163.00f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2927.49f, 4192.81f, 163.00f); break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88f,2737.85f,133.27f,2.59f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62f,2735.32f,134.49f,1.97f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73f,2754.50f,134.49f,3.29f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2453.88f, 2737.85f, 133.27f, 2.59f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2441.62f, 2735.32f, 134.49f, 1.97f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2450.73f, 2754.50f, 134.49f, 3.29f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f); break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18f,2202.85f,165.32f,5.45f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30f,2211.50f,165.32f,4.55f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); - add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02f,2217.45f,164.16f,4.96f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2956.18f, 2202.85f, 165.32f, 5.45f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2975.30f, 2211.50f, 165.32f, 4.55f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_PROT, 2965.02f, 2217.45f, 164.16f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f); break; case ENTRY_ARA_C_CONSOLE: - add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51f,4020.46f,192.18f,0.91f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4008.35f,4035.04f,192.70f); - add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56f,4059.35f,193.59f,4.44f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4016.62f,4039.89f,193.46f); + add = me->SummonCreature(ENTRY_ARA_ENGI, 3994.51f, 4020.46f, 192.18f, 0.91f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4008.35f, 4035.04f, 192.70f); + add = me->SummonCreature(ENTRY_ARA_GORKLONN, 4021.56f, 4059.35f, 193.59f, 4.44f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0, 4016.62f, 4039.89f, 193.46f); break; } } @@ -270,14 +270,14 @@ public: DoScriptText(EMOTE_COMPLETE, me); if (someplayer) { - Unit* u = Unit::GetUnit((*me),someplayer); + Unit* u = Unit::GetUnit((*me), someplayer); if (u && u->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(),me->GetGUID()); + CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); DoCast(me, SPELL_DISABLE_VISUAL); } if (goConsole) { - if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole)) + if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole)) pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } ++Phase; @@ -321,23 +321,23 @@ public: { case 3726: //b'naar if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29366,1)) - manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95f,4189.98f,161.88f,0.34f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29366, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3730: //coruu if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29396,1)) - manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77f,2750.38f,133.24f,2.14f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29396, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3734: //duro if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29397,1)) - manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48f,2183.29f,163.20f,1.85f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29397, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; case 3722: //ara if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && - pPlayer->HasItemCount(29411,1)) - manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71f,4028.76f,192.10f,1.25f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + pPlayer->HasItemCount(29411, 1)) + manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000); break; } @@ -431,8 +431,8 @@ public: // Emote Ardonis and Pathaleon void Turn_to_Pathaleons_Image() { - Creature *ardonis = Unit::GetCreature(*me,ardonisGUID); - Creature *pathaleon = Unit::GetCreature(*me,pathaleonGUID); + Creature *ardonis = Unit::GetCreature(*me, ardonisGUID); + Creature *pathaleon = Unit::GetCreature(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pathaleon || !pPlayer) @@ -457,7 +457,7 @@ public: //Set them back to each other void Turn_to_eachother() { - if (Unit *ardonis = Unit::GetUnit(*me,ardonisGUID)) + if (Unit *ardonis = Unit::GetUnit(*me, ardonisGUID)) { Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); @@ -514,8 +514,8 @@ public: return; } - Unit *ardonis = Unit::GetUnit(*me,ardonisGUID); - Unit *pathaleon = Unit::GetUnit(*me,pathaleonGUID); + Unit *ardonis = Unit::GetUnit(*me, ardonisGUID); + Unit *pathaleon = Unit::GetUnit(*me, pathaleonGUID); Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); if (!ardonis || !pPlayer) @@ -988,7 +988,7 @@ public: case 17: case 29: //Find Object and "work" - if (GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE)) + if (GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE)) { // take the GO -> animation me->HandleEmoteCommand(EMOTE_STATE_LOOT); @@ -1019,7 +1019,7 @@ public: if (uiTakeTimer < uiDiff) { me->HandleEmoteCommand(EMOTE_STATE_NONE); - if (GameObject* pGO = GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE)) + if (GameObject* pGO = GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE)) { SetEscortPaused(false); bTake=false; @@ -1041,7 +1041,7 @@ public: if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, pCreature->AI())) { pCreature->setFaction(113); - pEscortAI->Start(false,false,pPlayer->GetGUID()); + pEscortAI->Start(false, false, pPlayer->GetGUID()); } } return true; diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 45dae7034c7..c705a159d9b 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -293,10 +293,10 @@ public: { DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true); /* - float x,y,z; - me->GetPosition(x,y,z); + float x, y, z; + me->GetPosition(x, y, z); - float dx,dy,dz; + float dx, dy, dz; me->GetRandomPoint(x, y, z, 20, dx, dy, dz); dz += 20; // so it's in the air, not ground*/ @@ -474,9 +474,9 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658,1,true)) + if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659,1,true)) + if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659, 1, true)) pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); @@ -537,7 +537,7 @@ public: case GOSSIP_ACTION_INFO_DEF+6: //correct id not known pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID()); - pCreature->CastSpell(pPlayer,41121,false); + pCreature->CastSpell(pPlayer, 41121, false); pPlayer->AreaExploredOrEventHappens(QUEST_11082); break; } @@ -741,7 +741,7 @@ public: void StartEvent() { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); - me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83f, 602.584f, 85.2393f, 4.92598f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Illidan) { @@ -817,7 +817,7 @@ public: Illi->SetVisible(false); Illi->setDeathState(JUST_DIED); return 1000; break; - case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break; + case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break; case 24: me->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break; case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break; case 26: @@ -1013,7 +1013,7 @@ public: //this is very unclear, random say without no real relevance to script/event void DoRandomSay() { - DoScriptText(RAND(SAY_WIL_PROGRESS2,SAY_WIL_PROGRESS4,SAY_WIL_PROGRESS5), me); + DoScriptText(RAND(SAY_WIL_PROGRESS2, SAY_WIL_PROGRESS4, SAY_WIL_PROGRESS5), me); } void DoSpawnAssassin() @@ -1032,7 +1032,7 @@ public: if (pWho->GetTypeId() != TYPEID_PLAYER) { //appears to be random - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), pWho); } } @@ -1105,28 +1105,28 @@ struct Location static Location SpawnLocation[]= { //Cords used for: - {-4615.8556f, 1342.2532f, 139.9f, 1.612f},//Illidari Soldier - {-4598.9365f, 1377.3182f, 139.9f, 3.917f},//Illidari Soldier - {-4598.4697f, 1360.8999f, 139.9f, 2.427f},//Illidari Soldier - {-4589.3599f, 1369.1061f, 139.9f, 3.165f},//Illidari Soldier - {-4608.3477f, 1386.0076f, 139.9f, 4.108f},//Illidari Soldier - {-4633.1889f, 1359.8033f, 139.9f, 0.949f},//Illidari Soldier - {-4623.5791f, 1351.4574f, 139.9f, 0.971f},//Illidari Soldier - {-4607.2988f, 1351.6099f, 139.9f, 2.416f},//Illidari Soldier - {-4633.7764f, 1376.0417f, 139.9f, 5.608f},//Illidari Soldier - {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Mind Breaker - {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Mind Breaker - {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Highlord - {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Highlord - {-4615.5586f, 1353.0031f, 139.9f, 1.540f},//Illidari Highlord - {-4616.4736f, 1384.2170f, 139.9f, 4.971f},//Illidari Highlord + {-4615.8556f, 1342.2532f, 139.9f, 1.612f}, //Illidari Soldier + {-4598.9365f, 1377.3182f, 139.9f, 3.917f}, //Illidari Soldier + {-4598.4697f, 1360.8999f, 139.9f, 2.427f}, //Illidari Soldier + {-4589.3599f, 1369.1061f, 139.9f, 3.165f}, //Illidari Soldier + {-4608.3477f, 1386.0076f, 139.9f, 4.108f}, //Illidari Soldier + {-4633.1889f, 1359.8033f, 139.9f, 0.949f}, //Illidari Soldier + {-4623.5791f, 1351.4574f, 139.9f, 0.971f}, //Illidari Soldier + {-4607.2988f, 1351.6099f, 139.9f, 2.416f}, //Illidari Soldier + {-4633.7764f, 1376.0417f, 139.9f, 5.608f}, //Illidari Soldier + {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Mind Breaker + {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Mind Breaker + {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Highlord + {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Highlord + {-4615.5586f, 1353.0031f, 139.9f, 1.540f}, //Illidari Highlord + {-4616.4736f, 1384.2170f, 139.9f, 4.971f}, //Illidari Highlord {-4627.1240f, 1378.8752f, 139.9f, 2.544f} //Torloth The Magnificent }; struct WaveData { uint8 SpawnCount, UsedSpawnPoint; - uint32 CreatureId, SpawnTimer,YellTimer; + uint32 CreatureId, SpawnTimer, YellTimer; int32 WaveTextId; }; @@ -1218,10 +1218,10 @@ public: switch(AnimationCount) { case 0: - me->SetUInt32Value(UNIT_FIELD_BYTES_1,8); + me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); break; case 3: - me->RemoveFlag(UNIT_FIELD_BYTES_1,8); + me->RemoveFlag(UNIT_FIELD_BYTES_1, 8); break; case 5: if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID))) @@ -1238,8 +1238,8 @@ public: me->ClearUnitState(UNIT_STAT_ROOT); float x, y, z; - AggroTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); + AggroTarget->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z); } break; } @@ -1541,7 +1541,7 @@ public: { if (SpellTimer1 <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget->GetTypeId() == TYPEID_PLAYER) { @@ -1632,8 +1632,8 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() if (Player* pTarget = Unit::GetPlayer(*me, PlayerGUID)) { float x, y, z; - pTarget->GetPosition(x,y,z); - Spawn->GetMotionMaster()->MovePoint(0,x, y, z); + pTarget->GetPosition(x, y, z); + Spawn->GetMotionMaster()->MovePoint(0, x, y, z); } } CAST_AI(mob_illidari_spawn::mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); @@ -1786,7 +1786,7 @@ public: if (totemOspirits) { Summoned->setFaction(ENRAGED_SOUL_FRIENDLY); - Summoned->GetMotionMaster()->MovePoint(0,totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); + Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ()); Unit* Owner = totemOspirits->GetOwner(); if (Owner && Owner->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp index 1437702fbb5..12ac3ea777e 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/shattrath_city.cpp @@ -167,7 +167,7 @@ public: if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->HealthBelowPctDamaged(20, damage)) { - CAST_PLR(done_by)->GroupEventHappens(QUEST_10004,me); + CAST_PLR(done_by)->GroupEventHappens(QUEST_10004, me); damage = 0; EnterEvadeMode(); } @@ -265,7 +265,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - pPlayer->CastSpell(pPlayer,37778,false); + pPlayer->CastSpell(pPlayer, 37778, false); return true; } @@ -355,7 +355,7 @@ public: case 55: DoScriptText(WHISP20, me, pPlayer); break; case 56: DoScriptText(WHISP21, me, pPlayer); if (pPlayer) - pPlayer->GroupEventHappens(10211,me); + pPlayer->GroupEventHappens(10211, me); break; } } diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index b9a4d2c48e3..6a934362b2b 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -325,7 +325,7 @@ public: me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); if (rand()%100 < 75) - me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f,0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); + me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); } } @@ -577,16 +577,16 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,40642,false); + pPlayer->CastSpell(pPlayer, 40642, false); break; case GOSSIP_ACTION_INFO_DEF + 2: - pPlayer->CastSpell(pPlayer,40640,false); + pPlayer->CastSpell(pPlayer, 40640, false); break; case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->CastSpell(pPlayer,40632,false); + pPlayer->CastSpell(pPlayer, 40632, false); break; case GOSSIP_ACTION_INFO_DEF + 4: - pPlayer->CastSpell(pPlayer,40644,false); + pPlayer->CastSpell(pPlayer, 40644, false); break; } } @@ -679,12 +679,12 @@ public: switch(i) { case 3: - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99f,5420.33f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55f,5412.79f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER, -2793.55f, 5412.79f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 11: if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB,me); + pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB, me); break; } } diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 3face5ee606..b8c2aa34a0a 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -41,7 +41,7 @@ EndContentData */ #define GOSSIP_ITEM_BLESS_ASH "Grant me your mark, wise ancient." #define GOSSIP_ITEM_BLESS_KEL "Grant me your mark, mighty ancient." -//signed for 17900 but used by 17900,17901 +//signed for 17900 but used by 17900, 17901 #define GOSSIP_REWARD_BLESS -1000359 //#define TEXT_BLESSINGS "<You need higher standing with Cenarion Expedition to recive a blessing.>" @@ -70,8 +70,8 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pCreature->setPowerType(POWER_MANA); - pCreature->SetMaxPower(POWER_MANA,200); //set a "fake" mana value, we can't depend on database doing it in this case - pCreature->SetPower(POWER_MANA,200); + pCreature->SetMaxPower(POWER_MANA, 200); //set a "fake" mana value, we can't depend on database doing it in this case + pCreature->SetPower(POWER_MANA, 200); if (pCreature->GetEntry() == 17900) //check which Creature we are dealing with { @@ -246,7 +246,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 2: { - if (!pPlayer->HasItemCount(24573,1)) + if (!pPlayer->HasItemCount(24573, 1)) { ItemPosCountVec dest; uint32 itemId = 24573; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 28e38fbaac9..da4880b4b6b 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -711,7 +711,7 @@ class spell_gen_parachute_ic : public SpellScriptLoader return; if (target->ToPlayer()->m_movementInfo.fallTime > 2000) - target->CastSpell(target,SPELL_PARACHUTE_IC,true); + target->CastSpell(target, SPELL_PARACHUTE_IC, true); } void Register() diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 3a7983ac8f6..f30ced7b4b0 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -121,7 +121,7 @@ public: if (spellId) caster->CastCustomSpell(unitTarget, spellId, &basePoint, 0, 0, true); if (spellId == HUNTER_SPELL_CHIMERA_SHOT_SCORPID && caster->ToPlayer()) // Scorpid Sting - Add 1 minute cooldown - caster->ToPlayer()->AddSpellCooldown(spellId,0,uint32(time(NULL) + 60)); + caster->ToPlayer()->AddSpellCooldown(spellId, 0, uint32(time(NULL) + 60)); } void Register() @@ -281,7 +281,7 @@ public: spellInfo->Id != HUNTER_SPELL_READINESS && spellInfo->Id != HUNTER_SPELL_BESTIAL_WRATH && GetSpellRecoveryTime(spellInfo) > 0) - caster->ToPlayer()->RemoveSpellCooldown((itr++)->first,true); + caster->ToPlayer()->RemoveSpellCooldown((itr++)->first, true); else ++itr; } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 3679e004172..19a526826f0 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -834,9 +834,9 @@ class spell_item_create_heart_candy : public SpellScriptLoader Player* target = GetHitUnit()->ToPlayer(); - static const uint32 items[] = {ITEM_HEART_CANDY_1,ITEM_HEART_CANDY_2,ITEM_HEART_CANDY_3,ITEM_HEART_CANDY_4,ITEM_HEART_CANDY_5,ITEM_HEART_CANDY_6,ITEM_HEART_CANDY_7,ITEM_HEART_CANDY_8}; + static const uint32 items[] = {ITEM_HEART_CANDY_1, ITEM_HEART_CANDY_2, ITEM_HEART_CANDY_3, ITEM_HEART_CANDY_4, ITEM_HEART_CANDY_5, ITEM_HEART_CANDY_6, ITEM_HEART_CANDY_7, ITEM_HEART_CANDY_8}; - target->AddItem(items[urand(0,7)],1); + target->AddItem(items[urand(0, 7)], 1); } void Register() diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 4806457435d..762dd9292a8 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -33,7 +33,7 @@ enum ShamanSpells //For Earthen Power SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM = 6474, //Spell casted by totem - SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566,//Spell witch remove snare effect + SHAMAN_TOTEM_SPELL_EARTHEN_POWER = 59566, //Spell witch remove snare effect }; // 51474 - Astral shift diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 54c60da9909..48308545cc3 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -266,7 +266,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { - if (!player->FindNearestCreature(NPC_LARKORWI_MATE,15)) + if (!player->FindNearestCreature(NPC_LARKORWI_MATE, 15)) player->SummonCreature(NPC_LARKORWI_MATE, player->GetPositionX()+5, player->GetPositionY(), player->GetPositionZ(), 3.3f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 100000); } @@ -307,13 +307,13 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript { case 5332: case 5338: - pPosition = WorldLocation(571,3733.68f,3563.25f,290.812f,3.665192f); + pPosition = WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f); break; case 5334: - pPosition = WorldLocation(571,3802.38f,3585.95f,49.5765f,0.0f); + pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); break; case 5340: - pPosition = WorldLocation(571,3687.91f,3577.28f,473.342f,0.0f); + pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f); break; default: return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 2c39bb1b707..fc0c8f058af 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: GO_Scripts SD%Complete: 100 -SDComment: Quest support: 4285,4287,4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089,12843,12982, 2936. Soulwell +SDComment: Quest support: 4285, 4287, 4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089, 12843, 12982, 2936. Soulwell SDCategory: Game Objects EndScriptData */ @@ -67,7 +67,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; } }; @@ -148,7 +148,7 @@ public: { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { - pPlayer->CastSpell(pPlayer,26095,false); + pPlayer->CastSpell(pPlayer, 26095, false); } return true; } @@ -167,7 +167,7 @@ public: { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { - pPlayer->CastSpell(pPlayer,22864,false); + pPlayer->CastSpell(pPlayer, 22864, false); } return true; } @@ -213,7 +213,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) - pPlayer->CastSpell(pPlayer,23460,true); + pPlayer->CastSpell(pPlayer, 23460, true); return true; } @@ -232,7 +232,7 @@ public: { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { - pPlayer->CastSpell(pPlayer,24267,false); + pPlayer->CastSpell(pPlayer, 24267, false); } return true; } @@ -254,7 +254,7 @@ public: return true; if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE) - pPlayer->CastSpell(pPlayer,15065,false); + pPlayer->CastSpell(pPlayer, 15065, false); return true; } @@ -272,7 +272,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) - pPlayer->CastSpell(pPlayer,33382,true); + pPlayer->CastSpell(pPlayer, 33382, true); return true; } @@ -473,10 +473,10 @@ public: bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose - //pPlayer->CastSpell(pPlayer,SPELL_SUMMON_RIZZLE,false); + //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); if (Creature* pCreature = pPlayer->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0)) - pCreature->CastSpell(pPlayer,SPELL_BLACKJACK,false); + pCreature->CastSpell(pPlayer, SPELL_BLACKJACK, false); return false; } @@ -569,12 +569,12 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_BEAST,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_BEAST, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_BEAST,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_BEAST, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; @@ -628,12 +628,12 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_SORCERER,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_SORCERER, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 1: - pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_SORCERER,false); + pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_SORCERER, false); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID()); break; @@ -681,21 +681,21 @@ public: if (pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_YELLOW_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_YELLOW_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_B: if (pPlayer->HasItemCount(ITEM_YELLOW_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_YELLOW_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_BLUE_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_BLUE_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_C: if (pPlayer->HasItemCount(ITEM_BLUE_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_BLUE_PUNCH_CARD, 1, true); - pPlayer->CastSpell(pPlayer,SPELL_RED_PUNCH_CARD,true); + pPlayer->CastSpell(pPlayer, SPELL_RED_PUNCH_CARD, true); } break; case MATRIX_PUNCHOGRAPH_3005_D: @@ -856,16 +856,16 @@ public: switch(pPrisoner->GetEntry()) { case NPC_EBON_BLADE_PRISONER_HUMAN: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_H,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_H, true); break; case NPC_EBON_BLADE_PRISONER_NE: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_NE,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_NE, true); break; case NPC_EBON_BLADE_PRISONER_TROLL: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_TROLL,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_TROLL, true); break; case NPC_EBON_BLADE_PRISONER_ORC: - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_ORC,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_ORC, true); break; } return true; @@ -912,10 +912,10 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { - if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY,1)) + if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1)) return false; - pPlayer->CastSpell(pPlayer,SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB,true); + pPlayer->CastSpell(pPlayer, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true); return true; } @@ -1009,7 +1009,7 @@ public: if (qInfo) { //TODO: prisoner should help player for a short period of time - pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0); + pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); pPrisoner->DisappearAndDie(); } return true; @@ -1036,12 +1036,12 @@ public: { if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) { - Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE,1.0f); + Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f); if (pTadpole) { pGO->UseDoorOrButton(); pTadpole->DisappearAndDie(); - pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE,0); + pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE, 0); //FIX: Summon minion tadpole } } @@ -1072,14 +1072,14 @@ public: if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE)) { - Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT,1.0f); + Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f); if (!pPrisoner) - pPrisoner = pGO->FindNearestCreature(NPC_KUL,1.0f); + pPrisoner = pGO->FindNearestCreature(NPC_KUL, 1.0f); if (pPrisoner) { pGO->UseDoorOrButton(); pPrisoner->DisappearAndDie(); - pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(),0); + pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(), 0); } } return true; @@ -1133,11 +1133,11 @@ public: Creature* pTarget = GetClosestCreatureWithEntry(pPlayer, NPC_OUTHOUSE_BUNNY, 3.0f); if (pTarget) { - pTarget->AI()->SetData(1,pPlayer->getGender()); + pTarget->AI()->SetData(1, pPlayer->getGender()); pGO->CastSpell(pTarget, SPELL_INDISPOSED_III); } pGO->CastSpell(pPlayer, SPELL_INDISPOSED); - if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER,1)) + if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1)) pGO->CastSpell(pPlayer, SPELL_CREATE_AMBERSEEDS); return true; } @@ -1168,8 +1168,8 @@ public: bool OnGossipHello(Player *pPlayer, GameObject *pGO) { pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE); - pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX()+1,pGO->GetPositionY(),pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); - pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX(),pGO->GetPositionY()+1,pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); + pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); + pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX(), pGO->GetPositionY()+1, pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); return true; } }; diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index f3f7bd27720..0bf4b966471 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -64,7 +64,7 @@ public: void EnterCombat(Unit* who) { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) - DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1,SAY_GUARD_SIL_AGGRO2,SAY_GUARD_SIL_AGGRO3), me, who); + DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1, SAY_GUARD_SIL_AGGRO2, SAY_GUARD_SIL_AGGRO3), me, who); if (SpellEntry const* spell = me->reachWithSpellAttack(who)) DoCast(who, spell->Id); } @@ -124,7 +124,7 @@ public: info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE); //20% chance to replace our white hit with a spell - if (info && urand(0,99) < 20 && !globalCooldown) + if (info && urand(0, 99) < 20 && !globalCooldown) { //Cast the spell if (healing) @@ -171,9 +171,9 @@ public: //Cast spell if (healing) - DoCast(me,info->Id); + DoCast(me, info->Id); else - DoCast(me->getVictim(),info->Id); + DoCast(me->getVictim(), info->Id); //Set our global cooldown globalCooldown = GENERIC_CREATURE_COOLDOWN; @@ -268,10 +268,10 @@ public: { if (exileTimer <= diff) { - if (Unit* temp = Unit::GetUnit(*me,playerGUID)) + if (Unit* temp = Unit::GetUnit(*me, playerGUID)) { - temp->CastSpell(temp,SPELL_EXILE,true); - temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true); + temp->CastSpell(temp, SPELL_EXILE, true); + temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true); } playerGUID = 0; exileTimer = 8500; @@ -333,10 +333,10 @@ public: { if (exileTimer <= diff) { - if (Unit* temp = Unit::GetUnit(*me,playerGUID)) + if (Unit* temp = Unit::GetUnit(*me, playerGUID)) { - temp->CastSpell(temp,SPELL_EXILE,true); - temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true); + temp->CastSpell(temp, SPELL_EXILE, true); + temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true); } playerGUID = 0; exileTimer = 8500; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4129fe0e3fa..4b15cc79dd9 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -26,7 +26,7 @@ EndScriptData */ /* ContentData item_draenei_fishing_net(i23654) Hacklike implements chance to spawn item or creature item_nether_wraith_beacon(i31742) Summons creatures for quest Becoming a Spellfire Tailor (q10832) -item_flying_machine(i34060,i34061) Engineering crafted flying machines +item_flying_machine(i34060, i34061) Engineering crafted flying machines item_gor_dreks_ointment(i30175) Protecting Our Own(q10488) item_only_for_flight Items which should only useable while flying EndContentData */ @@ -75,7 +75,7 @@ public: return false; // error - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; @@ -95,7 +95,7 @@ public: { if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE) { - if (urand(0,99) < 35) + if (urand(0, 99) < 35) { Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Murloc) @@ -156,7 +156,7 @@ public: targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578)) return false; - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL); return true; } }; @@ -172,11 +172,11 @@ public: bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/) { - if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15)) + if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15)) return false; else { - pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,pItem,NULL); + pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); return true; } } @@ -376,19 +376,19 @@ public: return false; Creature* pMammoth; - pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF,5.0f); + pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f); if (!pMammoth) return false; GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = pPlayer->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = pPlayer->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pMammoth->AI()->DoAction(1); pTrap->SetGoState(GO_STATE_READY); - pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0); + pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF, 0); return true; } } @@ -418,7 +418,7 @@ public: } else pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW ,pItem, NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL); return true; } }; diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 626067bb602..1c146b85aee 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -143,8 +143,8 @@ public: IsSelfRooted = true; //Cast spell - if (Healing) DoCastSpell(me,info); - else DoCastSpell(me->getVictim(),info); + if (Healing) DoCastSpell(me, info); + else DoCastSpell(me->getVictim(), info); //Set our global cooldown GlobalCooldown = GENERIC_CREATURE_COOLDOWN; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 798ca9a86e4..1ca5fb54234 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -236,7 +236,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId) if (pItem->GetTemplate()->RequiredSpell == reqSpell) { //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetTemplate()->ItemId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.", reqSpell, pItem->GetTemplate()->ItemId); return false; } } @@ -499,17 +499,17 @@ public: switch(eCreature) { case 22427: //Zarevhi - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 19052: //Lorokeem - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 17909: //Lauranna Thar'well - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -645,7 +645,7 @@ public: //unknown textID (TALK_MUST_UNLEARN_WEAPON) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); } - else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON)) + else if (EquippedOk(pPlayer, S_UNLEARN_WEAPON)) { if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer))) { @@ -659,12 +659,12 @@ public: } else { - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); } break; case GOSSIP_ACTION_INFO_DEF + 4: - if (EquippedOk(pPlayer,S_UNLEARN_ARMOR)) + if (EquippedOk(pPlayer, S_UNLEARN_ARMOR)) { if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer))) { @@ -675,7 +675,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; //Learn Hammer/Axe/Sword @@ -693,7 +693,7 @@ public: break; //Unlearn Hammer/Axe/Sword case GOSSIP_ACTION_INFO_DEF + 8: - if (EquippedOk(pPlayer,S_UNLEARN_HAMMER)) + if (EquippedOk(pPlayer, S_UNLEARN_HAMMER)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -703,11 +703,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 9: - if (EquippedOk(pPlayer,S_UNLEARN_AXE)) + if (EquippedOk(pPlayer, S_UNLEARN_AXE)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -717,11 +717,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 10: - if (EquippedOk(pPlayer,S_UNLEARN_SWORD)) + if (EquippedOk(pPlayer, S_UNLEARN_SWORD)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -731,7 +731,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -774,23 +774,23 @@ public: case 11178: //Borgosh Corebender case 5164: //Grumnus Steelshaper case 11177: //Okothos Ironrager - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer), false); //unknown textID (TALK_UNLEARN_AXEORWEAPON) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11191: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_HAMMER_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11192: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_AXE_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 11193: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID (TALK_SWORD_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -1003,7 +1003,7 @@ public: break; //Unlearn Leather case GOSSIP_ACTION_INFO_DEF + 1: - if (EquippedOk(pPlayer,S_UNLEARN_DRAGON)) + if (EquippedOk(pPlayer, S_UNLEARN_DRAGON)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1013,11 +1013,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 2: - if (EquippedOk(pPlayer,S_UNLEARN_ELEMENTAL)) + if (EquippedOk(pPlayer, S_UNLEARN_ELEMENTAL)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1027,11 +1027,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 3: - if (EquippedOk(pPlayer,S_UNLEARN_TRIBAL)) + if (EquippedOk(pPlayer, S_UNLEARN_TRIBAL)) { if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer))) { @@ -1041,7 +1041,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -1056,19 +1056,19 @@ public: { case 7866: //Peter Galen case 7867: //Thorkaf Dragoneye - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 7868: //Sarah Tanner case 7869: //Brumn Winterhoof - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 7870: //Caryssia Moonhunter case 7871: //Se'Jib - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; @@ -1188,7 +1188,7 @@ public: break; //Unlearn Tailor case GOSSIP_ACTION_INFO_DEF + 4: - if (EquippedOk(pPlayer,S_UNLEARN_SPELLFIRE)) + if (EquippedOk(pPlayer, S_UNLEARN_SPELLFIRE)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1198,11 +1198,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 5: - if (EquippedOk(pPlayer,S_UNLEARN_MOONCLOTH)) + if (EquippedOk(pPlayer, S_UNLEARN_MOONCLOTH)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1212,11 +1212,11 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; case GOSSIP_ACTION_INFO_DEF + 6: - if (EquippedOk(pPlayer,S_UNLEARN_SHADOWEAVE)) + if (EquippedOk(pPlayer, S_UNLEARN_SHADOWEAVE)) { if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer))) { @@ -1226,7 +1226,7 @@ public: } else pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0); } else - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -1266,17 +1266,17 @@ public: switch(eCreature) { case 22213: //Gidge Spellweaver - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 22208: //Nasmara Moonsong - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; case 22212: //Andrion Darkspinner - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); break; diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 677f2307643..e5b4a140bb6 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -71,11 +71,11 @@ public: switch(pCreature->GetEntry()) { case 17435: // Azuremyst Isle - Susurrus - if (pPlayer->HasItemCount(23843,1,true)) + if (pPlayer->HasItemCount(23843, 1, true)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); break; case 20903: // Netherstorm - Protectorate Nether Drake - if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778,1)) + if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); break; case 18725: // Old Hillsbrad Foothills - Brazen @@ -165,7 +165,7 @@ public: break; case 23704: // Dustwallow Marsh - Cassa Crimsonwing if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25); break; case 26602: if (pCreature->isTaxi()) @@ -194,14 +194,14 @@ public: case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,32474,true); + pPlayer->CastSpell(pPlayer, 32474, true); break; case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155)) break; case GOSSIP_ACTION_INFO_DEF + 2: - if (!pPlayer->HasItemCount(25853,1)) { + if (!pPlayer->HasItemCount(25853, 1)) { pPlayer->SEND_GOSSIP_MENU(9780, pCreature->GetGUID()); } else { pPlayer->CLOSE_GOSSIP_MENU(); @@ -210,59 +210,59 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 3: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,53335,true); //TaxiPath 1041 (Stormwind Harbor) + pPlayer->CastSpell(pPlayer, 53335, true); //TaxiPath 1041 (Stormwind Harbor) break; case GOSSIP_ACTION_INFO_DEF + 4: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz) + pPlayer->CastSpell(pPlayer, 33768, true); //TaxiPath 585 (Gateways Murket and Shaadraz) break; case GOSSIP_ACTION_INFO_DEF + 5: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) + pPlayer->CastSpell(pPlayer, 35069, true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) break; case GOSSIP_ACTION_INFO_DEF + 6: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance)) + pPlayer->CastSpell(pPlayer, 33899, true); //TaxiPath 589 (Aerial Assault Flight (Alliance)) break; case GOSSIP_ACTION_INFO_DEF + 7: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head) + pPlayer->CastSpell(pPlayer, 35065, true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head) break; case GOSSIP_ACTION_INFO_DEF + 8: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz) + pPlayer->CastSpell(pPlayer, 33659, true); //TaxiPath 584 (Gateways Murket and Shaadraz) break; case GOSSIP_ACTION_INFO_DEF + 9: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde)) + pPlayer->CastSpell(pPlayer, 33825, true); //TaxiPath 587 (Aerial Assault Flight (Horde)) break; case GOSSIP_ACTION_INFO_DEF + 10: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) + pPlayer->CastSpell(pPlayer, 34578, true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) break; case GOSSIP_ACTION_INFO_DEF + 11: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,41278,true); //TaxiPath 706 + pPlayer->CastSpell(pPlayer, 41278, true); //TaxiPath 706 break; case GOSSIP_ACTION_INFO_DEF + 12: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45071,true); //TaxiPath 779 + pPlayer->CastSpell(pPlayer, 45071, true); //TaxiPath 779 break; case GOSSIP_ACTION_INFO_DEF + 13: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45113,true); //TaxiPath 784 + pPlayer->CastSpell(pPlayer, 45113, true); //TaxiPath 784 break; case GOSSIP_ACTION_INFO_DEF + 14: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,45353,true); //TaxiPath 788 + pPlayer->CastSpell(pPlayer, 45353, true); //TaxiPath 788 break; case GOSSIP_ACTION_INFO_DEF + 15: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,34905,true); //TaxiPath 606 + pPlayer->CastSpell(pPlayer, 34905, true); //TaxiPath 606 break; case GOSSIP_ACTION_INFO_DEF + 16: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,41279,true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) + pPlayer->CastSpell(pPlayer, 41279, true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) break; case GOSSIP_ACTION_INFO_DEF + 17: pPlayer->CLOSE_GOSSIP_MENU(); @@ -290,7 +290,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 23: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,43074,true); //TaxiPath 736 + pPlayer->CastSpell(pPlayer, 43074, true); //TaxiPath 736 break; case GOSSIP_ACTION_INFO_DEF + 24: pPlayer->CLOSE_GOSSIP_MENU(); @@ -299,7 +299,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 25: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,42295,true); + pPlayer->CastSpell(pPlayer, 42295, true); break; case GOSSIP_ACTION_INFO_DEF + 26: pPlayer->GetSession()->SendTaxiMenu(pCreature); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 0cc5545e9c8..cdc91f010f2 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -421,13 +421,13 @@ public: DoCast(me, SPELL_BRAZIER, true); DoCast(me, SPELL_FIERY_AURA, false); float x, y, z; - me->GetPosition(x,y,z); - me->Relocate(x,y,z + 0.94f); + me->GetPosition(x, y, z); + me->Relocate(x, y, z + 0.94f); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); WorldPacket data; //send update position to client me->BuildHeartBeatMsg(&data); - me->SendMessageToSet(&data,true); + me->SendMessageToSet(&data, true); } void UpdateAI(const uint32 diff) @@ -447,14 +447,14 @@ public: void ReceiveEmote(Player* pPlayer, uint32 emote) { - if (me->IsWithinLOS(pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer,30.0f)) + if (me->IsWithinLOS(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer, 30.0f)) { me->SetInFront(pPlayer); active = false; WorldPacket data; me->BuildHeartBeatMsg(&data); - me->SendMessageToSet(&data,true); + me->SendMessageToSet(&data, true); switch(emote) { case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break; @@ -755,7 +755,7 @@ public: //stand up me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); - DoScriptText(RAND(SAY_DOC1,SAY_DOC2,SAY_DOC3), me); + DoScriptText(RAND(SAY_DOC1, SAY_DOC2, SAY_DOC3), me); uint32 mobId = me->GetEntry(); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -878,7 +878,7 @@ enum eGarments ENTRY_KORJA = 12430, ENTRY_DG_KEL = 12428, - //used by 12429,12423,12427,12430,12428, but signed for 12429 + //used by 12429, 12423, 12427, 12430, 12428, but signed for 12429 SAY_COMMON_HEALED = -1000164, SAY_DG_KEL_THANKS = -1000165, SAY_DG_KEL_GOODBYE = -1000166, @@ -945,14 +945,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_SHAYA_THANKS,me,pCaster); + DoScriptText(SAY_SHAYA_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -962,14 +962,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_ROBERTS_THANKS,me,pCaster); + DoScriptText(SAY_ROBERTS_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -979,14 +979,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_DOLF_THANKS,me,pCaster); + DoScriptText(SAY_DOLF_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -996,14 +996,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_KORJA_THANKS,me,pCaster); + DoScriptText(SAY_KORJA_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -1013,14 +1013,14 @@ public: { if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1) { - DoScriptText(SAY_DG_KEL_THANKS,me,pCaster); + DoScriptText(SAY_DG_KEL_THANKS, me, pCaster); bCanRun = true; } else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2) { caster = pCaster->GetGUID(); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_COMMON_HEALED,me,pCaster); + DoScriptText(SAY_COMMON_HEALED, me, pCaster); bIsHealed = true; } } @@ -1029,7 +1029,7 @@ public: //give quest credit, not expect any special quest objectives if (bCanRun) - CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(),me->GetGUID()); + CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(), me->GetGUID()); } } } @@ -1044,18 +1044,18 @@ public: { if (RunAwayTimer <= diff) { - if (Unit *pUnit = Unit::GetUnit(*me,caster)) + if (Unit *pUnit = Unit::GetUnit(*me, caster)) { switch(me->GetEntry()) { - case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE,me,pUnit); break; - case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE,me,pUnit); break; - case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE,me,pUnit); break; - case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE,me,pUnit); break; - case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE,me,pUnit); break; + case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, pUnit); break; + case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE, me, pUnit); break; + case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE, me, pUnit); break; + case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE, me, pUnit); break; + case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE, me, pUnit); break; } - Start(false,true,true); + Start(false, true, true); } else EnterEvadeMode(); //something went wrong @@ -1141,7 +1141,7 @@ public: if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pPlayer->HasItemCount(ITEM_KT_SIGNET,1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) || + if (pPlayer->HasItemCount(ITEM_KT_SIGNET, 1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_H) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_N))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT_TO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -1155,7 +1155,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,SPELL_TELEPORT_DALARAN,false); + pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_DALARAN, false); } return true; } @@ -1283,7 +1283,7 @@ public: if (pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && pPlayer->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC); - if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681)) + if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126, 1) && !pPlayer->GetQuestRewardStatus(6681)) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(5996, pCreature->GetGUID()); @@ -1300,7 +1300,7 @@ public: { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer,21100,false); + pPlayer->CastSpell(pPlayer, 21100, false); break; case GOSSIP_ACTION_TRAIN: pPlayer->SEND_TRAINERLIST(pCreature->GetGUID()); @@ -1324,8 +1324,8 @@ public: // Cast spells that teach dual spec // Both are also ImplicitTarget self and must be cast by player - pPlayer->CastSpell(pPlayer,63680,true,NULL,NULL,pPlayer->GetGUID()); - pPlayer->CastSpell(pPlayer,63624,true,NULL,NULL,pPlayer->GetGUID()); + pPlayer->CastSpell(pPlayer, 63680, true, NULL, NULL, pPlayer->GetGUID()); + pPlayer->CastSpell(pPlayer, 63624, true, NULL, NULL, pPlayer->GetGUID()); // Should show another Gossip text with "Congratulations..." pPlayer->PlayerTalkClass->CloseGossip(); @@ -1454,42 +1454,42 @@ public: break; case GOSSIP_SENDER_MAIN+1: pCreature->CastSpell(pPlayer, SPELL_DMG, false); - pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_DMG, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+2: pCreature->CastSpell(pPlayer, SPELL_RES, false); - pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_RES, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+3: pCreature->CastSpell(pPlayer, SPELL_ARM, false); - pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_ARM, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+4: pCreature->CastSpell(pPlayer, SPELL_SPI, false); - pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_SPI, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+5: pCreature->CastSpell(pPlayer, SPELL_INT, false); - pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_INT, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+6: pCreature->CastSpell(pPlayer, SPELL_STM, false); - pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_STM, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+7: pCreature->CastSpell(pPlayer, SPELL_STR, false); - pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_STR, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+8: pCreature->CastSpell(pPlayer, SPELL_AGI, false); - pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200); + pPlayer->AddSpellCooldown(SPELL_AGI, 0, time(NULL) + 7200); SendAction(pPlayer, pCreature, uiAction); break; } @@ -1625,7 +1625,7 @@ public: { me->CastSpell(me, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->CastSpell(pPlayer, 26207, false); break; case 1: me->CastSpell(pPlayer, 26206, false); break; @@ -1724,10 +1724,10 @@ public: { if (IsViper) //Viper { - if (urand(0,2) == 0) //33% chance to cast + if (urand(0, 2) == 0) //33% chance to cast { uint32 spell; - if (urand(0,1) == 0) + if (urand(0, 1) == 0) spell = SPELL_MIND_NUMBING_POISON; else spell = SPELL_CRIPPLING_POISON; @@ -1739,7 +1739,7 @@ public: } else //Venomous Snake { - if (urand(0,2) == 0) //33% chance to cast + if (urand(0, 2) == 0) //33% chance to cast DoCast(me->getVictim(), SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100; } @@ -1779,7 +1779,7 @@ public: victimGUID = 0; hearts = 15000; if (Unit* own = me->GetOwner()) - me->GetMotionMaster()->MoveFollow(own,0,0); + me->GetMotionMaster()->MoveFollow(own, 0, 0); } void EnterCombat(Unit * /*who*/){} void UpdateAI(const uint32 diff) @@ -1817,17 +1817,17 @@ public: break; case 7:whisp.append(SAY_RANDOM_MOJO7);break; } - me->MonsterWhisper(whisp.c_str(),pPlayer->GetGUID()); + me->MonsterWhisper(whisp.c_str(), pPlayer->GetGUID()); if (victimGUID) { Player* victim = Unit::GetPlayer(*me, victimGUID); if (victim) victim->RemoveAura(43906);//remove polymorph frog thing } - me->AddAura(43906,pPlayer);//add polymorph frog thing + me->AddAura(43906, pPlayer);//add polymorph frog thing victimGUID = pPlayer->GetGUID(); DoCast(me, 20372, true);//tag.hearts - me->GetMotionMaster()->MoveFollow(pPlayer,0,0); + me->GetMotionMaster()->MoveFollow(pPlayer, 0, 0); hearts = 15000; } } @@ -1910,9 +1910,9 @@ public: Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check); me->VisitNearbyObject(30, searcher); for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) - if ((*iter)->GetAura(49206,owner->GetGUID())) + if ((*iter)->GetAura(49206, owner->GetGUID())) { - me->Attack((*iter),false); + me->Attack((*iter), false); break; } } @@ -2022,7 +2022,7 @@ public: void Reset() { - me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate + me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave uiResetTimer = 5000; @@ -2055,7 +2055,7 @@ public: return; if (!me->HasUnitState(UNIT_STAT_STUNNED)) - me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate + me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) { @@ -2107,7 +2107,7 @@ public: { if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND)) if (damage >= me->GetHealth()) - pOwner->CastSpell(pOwner,GLYPH_OF_SHADOWFIEND_MANA,true); + pOwner->CastSpell(pOwner, GLYPH_OF_SHADOWFIEND_MANA, true); } } @@ -2169,7 +2169,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { pPlayer->PlayerTalkClass->ClearMenus(); - bool roll = urand(0,1); + bool roll = urand(0, 1); switch(uiAction) { |