chore(Core/Misc): Some cleanup (#19970)

* remove weird blanks

* update if

* ) ) to ))

* missed some ) )

* now switch

* .
This commit is contained in:
Kitzunu
2024-09-21 19:34:31 +02:00
committed by GitHub
parent 0ba59c0053
commit 386aea03ee
157 changed files with 1606 additions and 1616 deletions
+1 -1
View File
@@ -279,7 +279,7 @@ bool DynamicMapTree::isInLineOfSight(float x1, float y1, float z1, float x2, flo
float maxDist = (v2 - v1).magnitude(); float maxDist = (v2 - v1).magnitude();
if (!G3D::fuzzyGt(maxDist, 0) ) if (!G3D::fuzzyGt(maxDist, 0))
{ {
return true; return true;
} }
+2 -2
View File
@@ -418,7 +418,7 @@ namespace VMAP
std::string model_name(buff, name_length); std::string model_name(buff, name_length);
WorldModel_Raw raw_model; WorldModel_Raw raw_model;
if ( !raw_model.Read((iSrcDir + "/" + model_name).c_str()) ) if (!raw_model.Read((iSrcDir + "/" + model_name).c_str()))
{ {
continue; continue;
} }
@@ -527,7 +527,7 @@ namespace VMAP
READ_OR_RETURN_WITH_DELETE(vectorarray, nvectors * sizeof(float) * 3); READ_OR_RETURN_WITH_DELETE(vectorarray, nvectors * sizeof(float) * 3);
for (uint32 i = 0; i < nvectors; ++i) for (uint32 i = 0; i < nvectors; ++i)
{ {
vertexArray.push_back( Vector3(vectorarray + 3 * i) ); vertexArray.push_back( Vector3(vectorarray + 3 * i));
} }
delete[] vectorarray; delete[] vectorarray;
@@ -227,5 +227,4 @@ namespace VMAP
if (check != nameLen) { return false; } if (check != nameLen) { return false; }
return true; return true;
} }
} }
+1 -1
View File
@@ -237,7 +237,7 @@ namespace Acore
//{ //{
// // The head element is bad // // The head element is bad
// SPECIFIC_TYPE* t = Remove(elements._elements, obj); // SPECIFIC_TYPE* t = Remove(elements._elements, obj);
// return ( t != nullptr ? t : Remove(elements._TailElements, obj) ); // return ( t != nullptr ? t : Remove(elements._TailElements, obj));
//} //}
} }
#endif #endif
@@ -137,7 +137,7 @@ namespace Acore
template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl) template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl)
{ {
typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl); typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl);
if ( iter != elements._element.end() ) if (iter != elements._element.end())
{ {
elements._element.erase(iter); elements._element.erase(iter);
return true; return true;
@@ -163,6 +163,5 @@ namespace Acore
bool t = Remove(elements._elements, obj, hdl); bool t = Remove(elements._elements, obj, hdl);
return ( !t ? Remove(elements._TailElements, obj, hdl) : t ); return ( !t ? Remove(elements._TailElements, obj, hdl) : t );
} }
} }
#endif #endif
+3 -3
View File
@@ -52,7 +52,7 @@ bool WinServiceInstall()
if (serviceControlMgr) if (serviceControlMgr)
{ {
char path[_MAX_PATH + 10]; char path[_MAX_PATH + 10];
if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0]) ) > 0) if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0])) > 0)
{ {
SC_HANDLE service; SC_HANDLE service;
std::strcat(path, " --service"); std::strcat(path, " --service");
@@ -170,7 +170,7 @@ void WINAPI ServiceControlHandler(DWORD controlCode)
break; break;
default: default:
if ( controlCode >= 128 && controlCode <= 255 ) if (controlCode >= 128 && controlCode <= 255)
// user defined control code // user defined control code
{ {
break; break;
@@ -198,7 +198,7 @@ void WINAPI ServiceMain(DWORD argc, char* argv[])
serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler);
if ( serviceStatusHandle ) if (serviceStatusHandle)
{ {
char path[_MAX_PATH + 1]; char path[_MAX_PATH + 1];
unsigned int i, last_slash = 0; unsigned int i, last_slash = 0;
+1 -1
View File
@@ -90,7 +90,7 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText)
{ {
ss << minutes << (shortText ? "m" : " minute(s) "); ss << minutes << (shortText ? "m" : " minute(s) ");
} }
if (secs || (!days && !hours && !minutes) ) if (secs || (!days && !hours && !minutes))
{ {
ss << secs << (shortText ? "s" : " second(s) "); ss << secs << (shortText ? "s" : " second(s) ");
} }
+1 -1
View File
@@ -256,7 +256,7 @@ void TurretAI::UpdateAI(uint32 /*diff*/)
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
if( me->m_spells[0] ) if (me->m_spells[0])
DoSpellAttackIfReady(me->m_spells[0]); DoSpellAttackIfReady(me->m_spells[0]);
} }
@@ -1562,7 +1562,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
for (WorldObject* target : targets) for (WorldObject* target : targets)
{ {
// xinef: allow gameobjects to summon gameobjects! // xinef: allow gameobjects to summon gameobjects!
//if(!IsUnit((*itr))) //if (!IsUnit((*itr)))
// continue; // continue;
target->GetPosition(x, y, z, o); target->GetPosition(x, y, z, o);
@@ -2352,7 +2352,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
LocaleConstant localeConstant = GetPlayer()->GetSession()->GetSessionDbLocaleIndex(); LocaleConstant localeConstant = GetPlayer()->GetSession()->GetSessionDbLocaleIndex();
if (localeConstant != LOCALE_enUS) if (localeConstant != LOCALE_enUS)
{ {
if(AchievementRewardLocale const* loc = sAchievementMgr->GetAchievementRewardLocale(achievement)) if (AchievementRewardLocale const* loc = sAchievementMgr->GetAchievementRewardLocale(achievement))
{ {
ObjectMgr::GetLocaleString(loc->Subject, localeConstant, subject); ObjectMgr::GetLocaleString(loc->Subject, localeConstant, subject);
ObjectMgr::GetLocaleString(loc->Text, localeConstant, text); ObjectMgr::GetLocaleString(loc->Text, localeConstant, text);
@@ -2539,7 +2539,7 @@ bool AchievementGlobalMgr::IsStatisticAchievement(AchievementEntry const* achiev
AchievementCategoryEntry const* cat = sAchievementCategoryStore.LookupEntry(achievement->categoryId); AchievementCategoryEntry const* cat = sAchievementCategoryStore.LookupEntry(achievement->categoryId);
do do
{ {
switch(cat->ID) switch (cat->ID)
{ {
case ACHIEVEMENT_CATEGORY_STATISTICS: case ACHIEVEMENT_CATEGORY_STATISTICS:
return true; return true;
@@ -250,7 +250,7 @@ AuctionHouseObject* AuctionHouseMgr::GetAuctionsMapByHouseId(uint8 auctionHouseI
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
return &_neutralAuctions; return &_neutralAuctions;
switch(auctionHouseId) switch (auctionHouseId)
{ {
case AUCTIONHOUSE_ALLIANCE: case AUCTIONHOUSE_ALLIANCE:
return &_allianceAuctions; return &_allianceAuctions;
@@ -260,7 +260,6 @@ AuctionHouseObject* AuctionHouseMgr::GetAuctionsMapByHouseId(uint8 auctionHouseI
} }
return &_neutralAuctions; return &_neutralAuctions;
} }
uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem, uint32 count) uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem, uint32 count)
@@ -64,7 +64,7 @@ void BattlefieldMgr::InitBattlefield()
/* For Cataclysm: Tol Barad /* For Cataclysm: Tol Barad
pBf = new BattlefieldTB; pBf = new BattlefieldTB;
// respawn, init variables // respawn, init variables
if(!pBf->SetupBattlefield()) if (!pBf->SetupBattlefield())
{ {
LOG_DEBUG("bg.battlefield", "Battlefield : Tol Barad init failed."); LOG_DEBUG("bg.battlefield", "Battlefield : Tol Barad init failed.");
delete pBf; delete pBf;
@@ -73,7 +73,7 @@ void BattlegroundNA::FillInitialWorldStates(WorldPacket& data)
bool BattlegroundNA::SetupBattleground() bool BattlegroundNA::SetupBattleground()
{ {
// gates // gates
if ( !AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.0462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY) if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.0462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179f, 2874.97f, 12.00171f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179f, 2874.97f, 12.00171f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709f, 2981.777f, 10.70117f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709f, 2981.777f, 10.70117f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064f, 2858.438f, 10.23631f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064f, 2858.438f, 10.23631f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
@@ -589,7 +589,7 @@ void BattlegroundSA::DefendersPortalTeleport(GameObject* portal, Player* plr)
uint32 portal_num = 0; uint32 portal_num = 0;
//get it via X //get it via X
switch( (uint32)portal->GetPositionX() ) switch ((uint32)portal->GetPositionX())
{ {
case 1394: case 1394:
portal_num = 0; portal_num = 0;
@@ -947,7 +947,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
uint32 npc = 0; uint32 npc = 0;
uint32 flag = 0; uint32 flag = 0;
switch(i) switch (i)
{ {
case BG_SA_LEFT_CAPTURABLE_GY: case BG_SA_LEFT_CAPTURABLE_GY:
flag = BG_SA_LEFT_FLAG; flag = BG_SA_LEFT_FLAG;
@@ -536,7 +536,7 @@ private:
uint32 GetGateIDFromEntry(uint32 id) uint32 GetGateIDFromEntry(uint32 id)
{ {
uint32 i = 0; uint32 i = 0;
switch(id) switch (id)
{ {
case 190722: case 190722:
i = BG_SA_GREEN_GATE; i = BG_SA_GREEN_GATE;
+1 -1
View File
@@ -28,7 +28,7 @@ enum CalendarMailAnswers
{ {
// else // else
CALENDAR_EVENT_REMOVED_MAIL_SUBJECT = 0, CALENDAR_EVENT_REMOVED_MAIL_SUBJECT = 0,
// if ( *(_DWORD *)(a1 + 8292) & 0x100 ) // if (*(_DWORD *)(a1 + 8292) & 0x100 )
CALENDAR_INVITE_REMOVED_MAIL_SUBJECT = 0x100 CALENDAR_INVITE_REMOVED_MAIL_SUBJECT = 0x100
}; };
+1 -1
View File
@@ -304,7 +304,7 @@ namespace lfg
//UpdateBestCompatibleInQueue(itQueue, strGuids); //UpdateBestCompatibleInQueue(itQueue, strGuids);
AddToCompatibles(strGuids); AddToCompatibles(strGuids);
if (roleCheckResult && roleCheckResult <= 15) if (roleCheckResult && roleCheckResult <= 15)
foundMask |= ( (((uint64)1) << (roleCheckResult - 1)) | (((uint64)1) << (16 + roleCheckResult - 1)) | (((uint64)1) << (32 + roleCheckResult - 1)) | (((uint64)1) << (48 + roleCheckResult - 1)) ); foundMask |= ( (((uint64)1) << (roleCheckResult - 1)) | (((uint64)1) << (16 + roleCheckResult - 1)) | (((uint64)1) << (32 + roleCheckResult - 1)) | (((uint64)1) << (48 + roleCheckResult - 1)));
return LFG_COMPATIBLES_WITH_LESS_PLAYERS; return LFG_COMPATIBLES_WITH_LESS_PLAYERS;
} }
@@ -3609,10 +3609,10 @@ float Creature::GetAttackDistance(Unit const* player) const
if (creatureLevel + 5 <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) if (creatureLevel + 5 <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
{ {
// detect range auras // detect range auras
retDistance += static_cast<float>( GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE) ); retDistance += static_cast<float>( GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE));
// detected range auras // detected range auras
retDistance += static_cast<float>( player->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE) ); retDistance += static_cast<float>( player->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE));
} }
// "Minimum Aggro Radius for a mob seems to be combat range (5 yards)" // "Minimum Aggro Radius for a mob seems to be combat range (5 yards)"
+1 -1
View File
@@ -1175,7 +1175,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4))); SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4)));
} }
switch(GetEntry()) switch (GetEntry())
{ {
case NPC_FELGUARD: case NPC_FELGUARD:
{ {
+6 -6
View File
@@ -4684,7 +4684,7 @@ void Player::DurabilityLossAll(double percent, bool inventory)
void Player::DurabilityLoss(Item* item, double percent) void Player::DurabilityLoss(Item* item, double percent)
{ {
if(!item || percent == 0.0) if (!item || percent == 0.0)
return; return;
uint32 pMaxDurability = item ->GetUInt32Value(ITEM_FIELD_MAXDURABILITY); uint32 pMaxDurability = item ->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
@@ -10001,13 +10001,13 @@ void Player::RemoveSpellMods(Spell* spell)
spell->m_appliedMods.erase(iterMod); spell->m_appliedMods.erase(iterMod);
// MAGE T8P4 BONUS // MAGE T8P4 BONUS
if( spellInfo->SpellFamilyName == SPELLFAMILY_MAGE ) if (spellInfo->SpellFamilyName == SPELLFAMILY_MAGE)
{ {
SpellInfo const* sp = mod->ownerAura->GetSpellInfo(); SpellInfo const* sp = mod->ownerAura->GetSpellInfo();
// Missile Barrage, Hot Streak, Brain Freeze (trigger spell - Fireball!) // Missile Barrage, Hot Streak, Brain Freeze (trigger spell - Fireball!)
if( sp->SpellIconID == 3261 || sp->SpellIconID == 2999 || sp->SpellIconID == 2938 ) if (sp->SpellIconID == 3261 || sp->SpellIconID == 2999 || sp->SpellIconID == 2938)
if( AuraEffect* aurEff = GetAuraEffectDummy(64869) ) if (AuraEffect* aurEff = GetAuraEffectDummy(64869))
if( roll_chance_i(aurEff->GetAmount()) ) if (roll_chance_i(aurEff->GetAmount()))
{ {
mod->charges = 1; mod->charges = 1;
continue; continue;
@@ -15443,7 +15443,7 @@ void Player::PrepareCharmAISpells()
} }
else if (spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_PERIODIC_DAMAGE) else if (spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_PERIODIC_DAMAGE)
{ {
if( (int32)periodic_damage < CalculateSpellDamage(this, spellInfo, i) ) if ((int32)periodic_damage < CalculateSpellDamage(this, spellInfo, i))
{ {
m_charmAISpells[SPELL_DOT_DAMAGE] = spellInfo->Id; m_charmAISpells[SPELL_DOT_DAMAGE] = spellInfo->Id;
break; break;
@@ -294,7 +294,7 @@ bool Player::CanCompleteQuest(uint32 quest_id, const QuestStatusData* q_savedSta
return false; return false;
// Xinef: take seasonals into account // Xinef: take seasonals into account
if(!qInfo->IsRepeatable() && !qInfo->IsSeasonal() && IsQuestRewarded(quest_id)) if (!qInfo->IsRepeatable() && !qInfo->IsSeasonal() && IsQuestRewarded(quest_id))
return false; // not allow re-complete quest return false; // not allow re-complete quest
// auto complete quest // auto complete quest
@@ -991,7 +991,7 @@ InventoryResult Player::CanStoreItem_InBag(uint8 bag, ItemPosCountVec& dest, Ite
// skip not existed bag or self targeted bag // skip not existed bag or self targeted bag
Bag* pBag = GetBagByPos(bag); Bag* pBag = GetBagByPos(bag);
if (!pBag || pBag == pSrcItem || (pSrcItem && (pSrcItem->GetGUID() == pBag->GetGUID())) ) if (!pBag || pBag == pSrcItem || (pSrcItem && (pSrcItem->GetGUID() == pBag->GetGUID())))
return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
if (pSrcItem && pSrcItem->IsNotEmptyBag()) if (pSrcItem && pSrcItem->IsNotEmptyBag())
@@ -1119,8 +1119,8 @@ InventoryResult Player::CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& des
if (pItem) if (pItem)
{ {
// you bad chet0rz, wpe pro // you bad chet0rz, wpe pro
if( bag == NULL_BAG && slot == NULL_SLOT ) if (bag == NULL_BAG && slot == NULL_SLOT)
if( pItem->IsBag() && pItem->IsNotEmptyBag() ) if (pItem->IsBag() && pItem->IsNotEmptyBag())
return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS; return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS;
// Xinef: Removed next loot generated check // Xinef: Removed next loot generated check
@@ -7197,7 +7197,7 @@ void Player::_SaveAuras(CharacterDatabaseTransaction trans, bool logout)
continue; continue;
Aura* aura = itr->second; Aura* aura = itr->second;
if( !logout && aura->GetDuration() < 60 * IN_MILLISECONDS ) if (!logout && aura->GetDuration() < 60 * IN_MILLISECONDS )
continue; continue;
int32 damage[MAX_SPELL_EFFECTS]; int32 damage[MAX_SPELL_EFFECTS];
+2 -2
View File
@@ -237,7 +237,7 @@ void Player::UpdateResistances(uint32 school)
AuraEffectList const& mResbyIntellect = GetAuraEffectsByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT); AuraEffectList const& mResbyIntellect = GetAuraEffectsByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT);
for(AuraEffectList::const_iterator i = mResbyIntellect.begin(); i != mResbyIntellect.end(); ++i) for(AuraEffectList::const_iterator i = mResbyIntellect.begin(); i != mResbyIntellect.end(); ++i)
{ {
if((*i)->GetMiscValue() & (1 << (school - 1)) ) if ((*i)->GetMiscValue() & (1 << (school - 1)))
value += int32(GetStat(Stats((*i)->GetMiscValueB())) * (*i)->GetAmount() / 100.0f); value += int32(GetStat(Stats((*i)->GetMiscValueB())) * (*i)->GetAmount() / 100.0f);
} }
@@ -923,7 +923,7 @@ void Player::ApplyHealthRegenBonus(int32 amount, bool apply)
void Player::UpdateManaRegen() void Player::UpdateManaRegen()
{ {
if( HasAuraTypeWithMiscvalue(SPELL_AURA_PREVENT_REGENERATE_POWER, POWER_MANA + 1) ) if (HasAuraTypeWithMiscvalue(SPELL_AURA_PREVENT_REGENERATE_POWER, POWER_MANA + 1))
{ {
SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, 0); SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, 0);
SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, 0); SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, 0);
+28 -28
View File
@@ -2772,7 +2772,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
// Critical hit chance // Critical hit chance
float crit_chance = GetUnitCriticalChance(attType, victim); float crit_chance = GetUnitCriticalChance(attType, victim);
if( crit_chance < 0 ) if (crit_chance < 0)
crit_chance = 0; crit_chance = 0;
float dodge_chance = victim->GetUnitDodgeChance(); float dodge_chance = victim->GetUnitDodgeChance();
@@ -4956,7 +4956,7 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint32 dispellerSpellId
if (Aura* noxious = Aura::TryCreate(aura->GetSpellInfo(), aura->GetEffectMask(), dispeller, caster)) if (Aura* noxious = Aura::TryCreate(aura->GetSpellInfo(), aura->GetEffectMask(), dispeller, caster))
{ {
noxious->SetDuration(aura->GetDuration() * aureff->GetAmount() / 100); noxious->SetDuration(aura->GetDuration() * aureff->GetAmount() / 100);
if (aura->GetUnitOwner() ) if (aura->GetUnitOwner())
if (const std::vector<int32>* spell_triggered = sSpellMgr->GetSpellLinked(-int32(aura->GetId()))) if (const std::vector<int32>* spell_triggered = sSpellMgr->GetSpellLinked(-int32(aura->GetId())))
for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr)
aura->GetUnitOwner()->RemoveAurasDueToSpell(*itr); aura->GetUnitOwner()->RemoveAurasDueToSpell(*itr);
@@ -5691,7 +5691,7 @@ bool Unit::HasVisibleAuraType(AuraType auraType) const
{ {
AuraEffectList const& mAuraList = GetAuraEffectsByType(auraType); AuraEffectList const& mAuraList = GetAuraEffectsByType(auraType);
for (AuraEffectList::const_iterator i = mAuraList.begin(); i != mAuraList.end(); ++i) for (AuraEffectList::const_iterator i = mAuraList.begin(); i != mAuraList.end(); ++i)
if( (*i)->GetBase()->CanBeSentToClient() ) if ((*i)->GetBase()->CanBeSentToClient())
return true; return true;
return false; return false;
@@ -6221,7 +6221,7 @@ void Unit::RemoveGameObject(uint32 spellid, bool del)
} }
go->SetOwnerGUID(ObjectGuid::Empty); go->SetOwnerGUID(ObjectGuid::Empty);
if(del) if (del)
{ {
go->SetRespawnTime(0); go->SetRespawnTime(0);
go->Delete(); go->Delete();
@@ -6236,7 +6236,7 @@ void Unit::RemoveAllGameObjects()
while(!m_gameObj.empty()) while(!m_gameObj.empty())
{ {
GameObject* go = ObjectAccessor::GetGameObject(*this, *m_gameObj.begin()); GameObject* go = ObjectAccessor::GetGameObject(*this, *m_gameObj.begin());
if(go) if (go)
{ {
go->SetOwnerGUID(ObjectGuid::Empty); go->SetOwnerGUID(ObjectGuid::Empty);
go->SetRespawnTime(0); go->SetRespawnTime(0);
@@ -7537,7 +7537,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
} }
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
{ {
switch(dummySpell->Id) switch (dummySpell->Id)
{ {
// Glyph of Backstab // Glyph of Backstab
case 56800: case 56800:
@@ -7546,7 +7546,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
if (AuraEffect* aurEff = victim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x100000, 0, 0, GetGUID())) if (AuraEffect* aurEff = victim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x100000, 0, 0, GetGUID()))
if (Aura* aur = aurEff->GetBase()) if (Aura* aur = aurEff->GetBase())
if (!aur->IsRemoved() && aur->GetDuration() > 0) if (!aur->IsRemoved() && aur->GetDuration() > 0)
if ((aur->GetApplyTime() + aur->GetMaxDuration() / 1000 + 5) > (GameTime::GetGameTime().count() + aur->GetDuration() / 1000) ) if ((aur->GetApplyTime() + aur->GetMaxDuration() / 1000 + 5) > (GameTime::GetGameTime().count() + aur->GetDuration() / 1000))
{ {
aur->SetDuration(aur->GetDuration() + 2000); aur->SetDuration(aur->GetDuration() + 2000);
return true; return true;
@@ -7565,7 +7565,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
} }
} }
// Master of subtlety // Master of subtlety
if( dummySpell->SpellIconID == 2114 ) if (dummySpell->SpellIconID == 2114)
{ {
triggered_spell_id = 31665; triggered_spell_id = 31665;
basepoints0 = triggerAmount; basepoints0 = triggerAmount;
@@ -8317,7 +8317,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
// Lightning Overload // Lightning Overload
if (dummySpell->SpellIconID == 2018) // only this spell have SpellFamily Shaman SpellIconID == 2018 and dummy aura if (dummySpell->SpellIconID == 2018) // only this spell have SpellFamily Shaman SpellIconID == 2018 and dummy aura
{ {
if(!procSpell || !IsPlayer() || !victim) if (!procSpell || !IsPlayer() || !victim)
return false; return false;
if (procEx & PROC_EX_CRITICAL_HIT) if (procEx & PROC_EX_CRITICAL_HIT)
@@ -8548,7 +8548,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
basepoints0 = triggerEntry->Effects[EFFECT_0].BasePoints * 2; basepoints0 = triggerEntry->Effects[EFFECT_0].BasePoints * 2;
SetCantProc(true); SetCantProc(true);
if(basepoints0) if (basepoints0)
CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster); CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster);
else else
CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster); CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster);
@@ -8688,7 +8688,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
AddSpellCooldown(cooldown_spell_id, 0, cooldown); AddSpellCooldown(cooldown_spell_id, 0, cooldown);
} }
if(basepoints0) if (basepoints0)
CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster); CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster);
else else
CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster); CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster);
@@ -9586,7 +9586,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
{ {
if (cooldown) if (cooldown)
{ {
if (pTarget->HasSpellCooldown(trigger_spell_id) ) if (pTarget->HasSpellCooldown(trigger_spell_id))
return false; return false;
pTarget->AddSpellCooldown(trigger_spell_id, 0, cooldown); pTarget->AddSpellCooldown(trigger_spell_id, 0, cooldown);
} }
@@ -9622,7 +9622,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
// Ruby Drake, Evasive Aura // Ruby Drake, Evasive Aura
case 50241: case 50241:
{ {
if( GetAura(50240) ) if (GetAura(50240))
return false; return false;
break; break;
@@ -9812,7 +9812,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
AddSpellCooldown(triggerEntry->Id, 0, cooldown); AddSpellCooldown(triggerEntry->Id, 0, cooldown);
} }
if(basepoints0) if (basepoints0)
CastCustomSpell(target, triggerEntry->Id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura); CastCustomSpell(target, triggerEntry->Id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura);
else else
CastSpell(target, triggerEntry->Id, true, castItem, triggeredByAura); CastSpell(target, triggerEntry->Id, true, castItem, triggeredByAura);
@@ -10466,11 +10466,11 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply)
Unit::AuraMap& tAuras = GetOwnedAuras(); Unit::AuraMap& tAuras = GetOwnedAuras();
for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr) for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr)
{ {
if( (*itr).second->IsRemoved() ) if ((*itr).second->IsRemoved())
continue; continue;
if( (*itr).second->GetSpellInfo()->CasterAuraState == flag ) if ((*itr).second->GetSpellInfo()->CasterAuraState == flag )
if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) ) if (AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()))
(*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true); (*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true);
} }
} }
@@ -10486,8 +10486,8 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply)
Unit::AuraMap& tAuras = GetOwnedAuras(); Unit::AuraMap& tAuras = GetOwnedAuras();
for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr) for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr)
{ {
if( (*itr).second->GetSpellInfo()->CasterAuraState == flag ) if ((*itr).second->GetSpellInfo()->CasterAuraState == flag )
if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) ) if (AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()))
(*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, false); (*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, false);
} }
} }
@@ -11383,7 +11383,7 @@ float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, Da
// Merciless Combat // Merciless Combat
if ((*i)->GetSpellInfo()->SpellIconID == 2656) if ((*i)->GetSpellInfo()->SpellIconID == 2656)
{ {
if( (spellProto && spellProto->SpellFamilyFlags[0] & 0x2) || spellProto->SpellFamilyFlags[1] & 0x2 ) if ((spellProto && spellProto->SpellFamilyFlags[0] & 0x2) || spellProto->SpellFamilyFlags[1] & 0x2 )
if (!victim->HealthAbovePct(35)) if (!victim->HealthAbovePct(35))
AddPct(DoneTotalMod, (*i)->GetAmount()); AddPct(DoneTotalMod, (*i)->GetAmount());
} }
@@ -12463,7 +12463,7 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
// Check for table values // Check for table values
SpellBonusEntry const* bonus = sSpellMgr->GetSpellBonusData(spellProto->Id); SpellBonusEntry const* bonus = sSpellMgr->GetSpellBonusData(spellProto->Id);
if(bonus) if (bonus)
{ {
if (damagetype == DOT) if (damagetype == DOT)
{ {
@@ -12711,7 +12711,7 @@ bool Unit::IsImmunedToDamage(SpellSchoolMask meleeSchoolMask) const
// If m_immuneToDamage type contain magic, IMMUNE damage. // If m_immuneToDamage type contain magic, IMMUNE damage.
SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE]; SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE];
for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr) for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
if((itr->type & meleeSchoolMask) == meleeSchoolMask) if ((itr->type & meleeSchoolMask) == meleeSchoolMask)
return true; return true;
return false; return false;
@@ -12743,7 +12743,7 @@ bool Unit::IsImmunedToDamage(SpellInfo const* spellInfo) const
// If m_immuneToDamage type contain magic, IMMUNE damage. // If m_immuneToDamage type contain magic, IMMUNE damage.
SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE]; SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE];
for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr) for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
if((itr->type & schoolMask) == schoolMask) if ((itr->type & schoolMask) == schoolMask)
return true; return true;
return false; return false;
@@ -12796,7 +12796,7 @@ bool Unit::IsImmunedToSchool(SpellSchoolMask meleeSchoolMask) const
// If m_immuneToSchool type contain this school type, IMMUNE damage. // If m_immuneToSchool type contain this school type, IMMUNE damage.
SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
if((itr->type & meleeSchoolMask) == meleeSchoolMask) if ((itr->type & meleeSchoolMask) == meleeSchoolMask)
return true; return true;
return false; return false;
@@ -12818,7 +12818,7 @@ bool Unit::IsImmunedToSchool(SpellInfo const* spellInfo) const
// If m_immuneToSchool type contain this school type, IMMUNE damage. // If m_immuneToSchool type contain this school type, IMMUNE damage.
SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
if((itr->type & schoolMask) == schoolMask && !spellInfo->CanPierceImmuneAura(sSpellMgr->GetSpellInfo(itr->spellId))) if ((itr->type & schoolMask) == schoolMask && !spellInfo->CanPierceImmuneAura(sSpellMgr->GetSpellInfo(itr->spellId)))
return true; return true;
} }
@@ -13897,7 +13897,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
{ {
Player* owner = GetAffectingPlayer(); Player* owner = GetAffectingPlayer();
Unit const* const thisUnit = owner ? owner : this; Unit const* const thisUnit = owner ? owner : this;
if (!(target->IsPlayer() && thisUnit->IsPlayer()) && if (!(target->IsPlayer() && thisUnit->IsPlayer()) &&
!(target->IsCreature() && thisUnit->IsCreature())) !(target->IsCreature() && thisUnit->IsCreature()))
{ {
Player const* player = target->IsPlayer() ? target->ToPlayer() : thisUnit->ToPlayer(); Player const* player = target->IsPlayer() ? target->ToPlayer() : thisUnit->ToPlayer();
@@ -15385,7 +15385,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, Unit* victim) con
if (attType == RANGED_ATTACK) if (attType == RANGED_ATTACK)
{ {
int32 ap = GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS); int32 ap = GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS);
if( victim ) if (victim)
ap += victim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS); ap += victim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS);
if (ap < 0) if (ap < 0)
@@ -15395,7 +15395,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, Unit* victim) con
else else
{ {
int32 ap = GetInt32Value(UNIT_FIELD_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS); int32 ap = GetInt32Value(UNIT_FIELD_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS);
if( victim ) if (victim)
ap += victim->GetTotalAuraModifier(SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS); ap += victim->GetTotalAuraModifier(SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS);
if (ap < 0) if (ap < 0)
-1
View File
@@ -702,7 +702,6 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields, bool triggerHook)
{ {
sScriptMgr->OnAfterDatabaseLoadCreatureTemplates(_creatureTemplateStoreFast); sScriptMgr->OnAfterDatabaseLoadCreatureTemplates(_creatureTemplateStoreFast);
} }
} }
void ObjectMgr::LoadCreatureTemplateModels() void ObjectMgr::LoadCreatureTemplateModels()
@@ -838,8 +838,8 @@ namespace Acore
FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range) FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range)
{ {
i_spell = spellid; i_spell = spellid;
if( SpellInfo const* spell = sSpellMgr->GetSpellInfo(spellid) ) if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(spellid))
if( SpellInfo const* newSpell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, const_cast<Unit*>(obj)) ) if (SpellInfo const* newSpell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, const_cast<Unit*>(obj)))
i_spell = newSpell->Id; i_spell = newSpell->Id;
} }
bool operator()(Unit* u) bool operator()(Unit* u)
+1 -1
View File
@@ -1573,7 +1573,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap)
ItemPosCountVec dest; ItemPosCountVec dest;
InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count); InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count);
if(msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
player->AutoStoreLoot(pProto->DisenchantID, LootTemplates_Disenchant, true); player->AutoStoreLoot(pProto->DisenchantID, LootTemplates_Disenchant, true);
} }
+1 -1
View File
@@ -241,7 +241,7 @@ void Guild::BankEventLogEntry::WritePacket(WorldPackets::Guild::GuildBankLogQuer
bankLogEntry.TimeOffset = int32(GameTime::GetGameTime().count() - m_timestamp); bankLogEntry.TimeOffset = int32(GameTime::GetGameTime().count() - m_timestamp);
bankLogEntry.EntryType = int8(m_eventType); bankLogEntry.EntryType = int8(m_eventType);
switch(m_eventType) switch (m_eventType)
{ {
case GUILD_BANK_LOG_DEPOSIT_ITEM: case GUILD_BANK_LOG_DEPOSIT_ITEM:
case GUILD_BANK_LOG_WITHDRAW_ITEM: case GUILD_BANK_LOG_WITHDRAW_ITEM:
+1 -1
View File
@@ -1160,7 +1160,7 @@ void WorldSession::HandleGroupSwapSubGroupOpcode(WorldPacket& recv_data)
ObjectGuid guid1 = getGuid(playerName1); ObjectGuid guid1 = getGuid(playerName1);
ObjectGuid guid2 = getGuid(playerName2); ObjectGuid guid2 = getGuid(playerName2);
if(!guid1 || !guid2) if (!guid1 || !guid2)
{ {
SendPartyResult(PARTY_OP_SWAP, playerName1, ERR_GROUP_SWAP_FAILED); SendPartyResult(PARTY_OP_SWAP, playerName1, ERR_GROUP_SWAP_FAILED);
return; return;
+2 -2
View File
@@ -319,7 +319,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
needItemDelay = GetAccountId() != rc_account; needItemDelay = GetAccountId() != rc_account;
} }
if( money >= 10 * GOLD ) if (money >= 10 * GOLD)
{ {
CleanStringForMysqlQuery(subject); CleanStringForMysqlQuery(subject);
CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"{}\", NOW(), {})", CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"{}\", NOW(), {})",
@@ -551,7 +551,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket& recvData)
.AddMoney(m->COD) .AddMoney(m->COD)
.SendMailTo(trans, MailReceiver(sender, m->sender), MailSender(MAIL_NORMAL, m->receiver), MAIL_CHECK_MASK_COD_PAYMENT); .SendMailTo(trans, MailReceiver(sender, m->sender), MailSender(MAIL_NORMAL, m->receiver), MAIL_CHECK_MASK_COD_PAYMENT);
if( m->COD >= 10 * GOLD ) if (m->COD >= 10 * GOLD)
{ {
std::string senderName; std::string senderName;
if (!sCharacterCache->GetCharacterNameByGuid(ObjectGuid(HighGuid::Player, m->sender), senderName)) if (!sCharacterCache->GetCharacterNameByGuid(ObjectGuid(HighGuid::Player, m->sender), senderName))
+1 -1
View File
@@ -1707,7 +1707,7 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/)
if (_player->IsInFlight()) if (_player->IsInFlight())
return; return;
if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId())) if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
{ {
bf->PlayerAskToLeave(_player); bf->PlayerAskToLeave(_player);
return; return;
+1 -1
View File
@@ -462,7 +462,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
spell->SendPetCastResult(SPELL_FAILED_DONT_REPORT); spell->SendPetCastResult(SPELL_FAILED_DONT_REPORT);
if (!pet->HasSpellCooldown(spellId)) if (!pet->HasSpellCooldown(spellId))
if(pet->ToPet()) if (pet->ToPet())
pet->ToPet()->RemoveSpellCooldown(spellId, true); pet->ToPet()->RemoveSpellCooldown(spellId, true);
spell->finish(false); spell->finish(false);
+2 -2
View File
@@ -375,7 +375,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
if (mover->IsPlayer()) if (mover->IsPlayer())
{ {
// not have spell in spellbook or spell passive and not casted by client // not have spell in spellbook or spell passive and not casted by client
if( !(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive()) ) if (!(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive()))
{ {
bool allow = false; bool allow = false;
@@ -411,7 +411,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
if (seat->m_flags & VEHICLE_SEAT_FLAG_CAN_ATTACK || spellInfo->Effects[EFFECT_0].Effect == SPELL_EFFECT_OPEN_LOCK /*allow looting from vehicle, but only if player has required spell (all necessary opening spells are in playercreateinfo_spell)*/) if (seat->m_flags & VEHICLE_SEAT_FLAG_CAN_ATTACK || spellInfo->Effects[EFFECT_0].Effect == SPELL_EFFECT_OPEN_LOCK /*allow looting from vehicle, but only if player has required spell (all necessary opening spells are in playercreateinfo_spell)*/)
if ((mover->IsCreature() && !mover->ToCreature()->HasSpell(spellId)) || spellInfo->IsPassive()) // the creature can't cast that spell, check player instead if ((mover->IsCreature() && !mover->ToCreature()->HasSpell(spellId)) || spellInfo->IsPassive()) // the creature can't cast that spell, check player instead
{ {
if( !(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!_player->HasActiveSpell (spellId) || spellInfo->IsPassive()) ) if (!(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!_player->HasActiveSpell (spellId) || spellInfo->IsPassive()))
{ {
//cheater? kick? ban? //cheater? kick? ban?
recvPacket.rfinish(); // prevent spam at ignore packet recvPacket.rfinish(); // prevent spam at ignore packet
+2 -2
View File
@@ -462,12 +462,12 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
// execute trade: 2. store // execute trade: 2. store
moveItems(myItems, hisItems); moveItems(myItems, hisItems);
if( my_trade->GetMoney() >= 10 * GOLD ) if (my_trade->GetMoney() >= 10 * GOLD )
{ {
CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})", CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})",
GetAccountId(), _player->GetGUID().GetCounter(), _player->GetName(), GetRemoteAddress(), trader->GetSession()->GetAccountId(), trader->GetName(), my_trade->GetMoney(), 6); GetAccountId(), _player->GetGUID().GetCounter(), _player->GetName(), GetRemoteAddress(), trader->GetSession()->GetAccountId(), trader->GetName(), my_trade->GetMoney(), 6);
} }
if( his_trade->GetMoney() >= 10 * GOLD ) if (his_trade->GetMoney() >= 10 * GOLD )
{ {
CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})", CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})",
trader->GetSession()->GetAccountId(), trader->GetGUID().GetCounter(), trader->GetName(), trader->GetSession()->GetRemoteAddress(), GetAccountId(), _player->GetName(), his_trade->GetMoney(), 6); trader->GetSession()->GetAccountId(), trader->GetGUID().GetCounter(), trader->GetName(), trader->GetSession()->GetRemoteAddress(), GetAccountId(), _player->GetName(), his_trade->GetMoney(), 6);
@@ -301,5 +301,4 @@ namespace Movement
return str.str(); return str.str();
} }
} }
-1
View File
@@ -205,7 +205,6 @@ namespace Movement
void set_length(index_type i, length_type length) { lengths[i] = length;} void set_length(index_type i, length_type length) { lengths[i] = length;}
void clear(); void clear();
}; };
} }
#include "SplineImpl.h" #include "SplineImpl.h"
@@ -92,5 +92,4 @@ namespace Movement
SplineBase::clear(); SplineBase::clear();
lengths.clear(); lengths.clear();
} }
} }
@@ -299,7 +299,6 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/)
void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/) void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/)
{ {
} }
bool OutdoorPvP::Update(uint32 diff) bool OutdoorPvP::Update(uint32 diff)
@@ -55,7 +55,6 @@ void ScriptMgr::OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creat
{ {
script->OnBeforeCreatureSelectLevel(cinfo, creature, level); script->OnBeforeCreatureSelectLevel(cinfo, creature, level);
}); });
} }
void ScriptMgr::Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature) void ScriptMgr::Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature)
+1 -1
View File
@@ -988,7 +988,7 @@ void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi)
if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION)) if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION))
data >> mi->splineElevation; data >> mi->splineElevation;
//! Anti-cheat checks. Please keep them in seperate if() blocks to maintain a clear overview. //! Anti-cheat checks. Please keep them in seperate if () blocks to maintain a clear overview.
//! Might be subject to latency, so just remove improper flags. //! Might be subject to latency, so just remove improper flags.
#ifdef ACORE_DEBUG #ifdef ACORE_DEBUG
#define REMOVE_VIOLATING_FLAGS(check, maskToRemove) \ #define REMOVE_VIOLATING_FLAGS(check, maskToRemove) \
@@ -1058,7 +1058,7 @@ float AuraEffect::CalcPeriodicCritChance(Unit const* caster, Unit const* target)
} }
} }
switch(GetSpellInfo()->SpellFamilyName) switch (GetSpellInfo()->SpellFamilyName)
{ {
// Rupture - since 3.3.3 can crit // Rupture - since 3.3.3 can crit
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
@@ -5603,7 +5603,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
{ {
if (Battleground* bg = target->ToPlayer()->GetBattleground()) if (Battleground* bg = target->ToPlayer()->GetBattleground())
bg->RemovePlayerFromResurrectQueue(target->ToPlayer()); bg->RemovePlayerFromResurrectQueue(target->ToPlayer());
if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId())) if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId()))
bf->RemovePlayerFromResurrectQueue(target->GetGUID()); bf->RemovePlayerFromResurrectQueue(target->GetGUID());
} }
break; break;
@@ -5623,7 +5623,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
// Halls of Lightning, Arc Lightning // Halls of Lightning, Arc Lightning
case 52921: case 52921:
{ {
if( aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE ) if (aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE )
return; return;
Player* player = nullptr; Player* player = nullptr;
@@ -5631,7 +5631,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
Acore::PlayerSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(target, player, checker); Acore::PlayerSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(target, player, checker);
Cell::VisitWorldObjects(target, searcher, 10.0f); Cell::VisitWorldObjects(target, searcher, 10.0f);
if( player && player->GetGUID() != target->GetGUID() ) if (player && player->GetGUID() != target->GetGUID())
target->CastSpell(player, 52921, true); target->CastSpell(player, 52921, true);
return; return;
@@ -6488,7 +6488,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster)
{ {
if (caster) if (caster)
if (Unit* victim = caster->GetVictim()) if (Unit* victim = caster->GetVictim())
if(victim->GetDistance(caster) < 45.0f) if (victim->GetDistance(caster) < 45.0f)
{ {
target = victim; target = victim;
break; break;
+2 -2
View File
@@ -1613,7 +1613,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
case SPELLFAMILY_GENERIC: case SPELLFAMILY_GENERIC:
if (!caster) if (!caster)
break; break;
switch(GetId()) switch (GetId())
{ {
case 61987: // Avenging Wrath case 61987: // Avenging Wrath
// Remove the immunity shield marker on Avenging Wrath removal if Forbearance is not present // Remove the immunity shield marker on Avenging Wrath removal if Forbearance is not present
@@ -2010,7 +2010,7 @@ bool Aura::IsAuraStronger(Aura const* newAura) const
return true; return true;
if (curValue == std::abs(newEffect->GetAmount())) if (curValue == std::abs(newEffect->GetAmount()))
if(!IsPassive() && !IsPermanent() && GetDuration() < newAura->GetDuration()) if (!IsPassive() && !IsPermanent() && GetDuration() < newAura->GetDuration())
return true; return true;
} }
} }
+11 -11
View File
@@ -3069,7 +3069,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
{ {
// for delayed spells ignore negative spells (after duel end) for friendly targets // for delayed spells ignore negative spells (after duel end) for friendly targets
/// @todo: this cause soul transfer bugged /// @todo: this cause soul transfer bugged
if(!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->IsPlayer() && !m_spellInfo->IsPositive()) if (!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->IsPlayer() && !m_spellInfo->IsPositive())
return SPELL_MISS_EVADE; return SPELL_MISS_EVADE;
// assisting case, healing and resurrection // assisting case, healing and resurrection
@@ -3248,7 +3248,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
HandleEffects(unit, nullptr, nullptr, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); HandleEffects(unit, nullptr, nullptr, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET);
} }
if( sanct_effect >= 0 && (effectMask & (1 << sanct_effect)) ) if (sanct_effect >= 0 && (effectMask & (1 << sanct_effect)))
HandleEffects(unit, nullptr, nullptr, sanct_effect, SPELL_EFFECT_HANDLE_HIT_TARGET); HandleEffects(unit, nullptr, nullptr, sanct_effect, SPELL_EFFECT_HANDLE_HIT_TARGET);
return SPELL_MISS_NONE; return SPELL_MISS_NONE;
@@ -3275,7 +3275,7 @@ void Spell::DoTriggersOnSpellHit(Unit* unit, uint8 effMask)
m_caster->CastSpell(unit, 61988, true); m_caster->CastSpell(unit, 61988, true);
// Fearie Fire (Feral) - damage // Fearie Fire (Feral) - damage
if( m_preCastSpell == 60089 ) if (m_preCastSpell == 60089)
m_caster->CastSpell(unit, m_preCastSpell, true); m_caster->CastSpell(unit, m_preCastSpell, true);
else if (sSpellMgr->GetSpellInfo(m_preCastSpell)) else if (sSpellMgr->GetSpellInfo(m_preCastSpell))
// Blizz seems to just apply aura without bothering to cast // Blizz seems to just apply aura without bothering to cast
@@ -6540,24 +6540,24 @@ SpellCastResult Spell::CheckCast(bool strict)
} }
case SPELL_EFFECT_STEAL_BENEFICIAL_BUFF: case SPELL_EFFECT_STEAL_BENEFICIAL_BUFF:
{ {
if( !m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster) if (!m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster)
return SPELL_FAILED_BAD_TARGETS; return SPELL_FAILED_BAD_TARGETS;
bool found = false; bool found = false;
Unit::VisibleAuraMap const* visibleAuras = m_targets.GetUnitTarget()->GetVisibleAuras(); Unit::VisibleAuraMap const* visibleAuras = m_targets.GetUnitTarget()->GetVisibleAuras();
for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr) for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr)
{ {
if( itr->second->GetBase()->IsPassive() ) if (itr->second->GetBase()->IsPassive())
continue; continue;
if( !itr->second->IsPositive() ) if (!itr->second->IsPositive())
continue; continue;
found = true; found = true;
break; break;
} }
if( !found ) if (!found)
return SPELL_FAILED_NOTHING_TO_STEAL; return SPELL_FAILED_NOTHING_TO_STEAL;
break; break;
@@ -8757,17 +8757,17 @@ void Spell::PrepareTriggersExecutedOnHit()
{ {
case SPELLFAMILY_PALADIN: case SPELLFAMILY_PALADIN:
{ {
if( m_spellInfo->SpellFamilyFlags[1] & 0x40000000 ) if (m_spellInfo->SpellFamilyFlags[1] & 0x40000000)
{ {
Unit::AuraEffectList const& mVindication = m_caster->GetAuraEffectsByType(SPELL_AURA_PROC_TRIGGER_SPELL); Unit::AuraEffectList const& mVindication = m_caster->GetAuraEffectsByType(SPELL_AURA_PROC_TRIGGER_SPELL);
for(Unit::AuraEffectList::const_iterator itr = mVindication.begin(); itr != mVindication.end(); ++itr) for(Unit::AuraEffectList::const_iterator itr = mVindication.begin(); itr != mVindication.end(); ++itr)
{ {
if( (*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 26017 ) if ((*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 26017 )
{ {
m_preCastSpell = 26017; m_preCastSpell = 26017;
break; break;
} }
else if( (*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 67 ) else if ((*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 67 )
m_preCastSpell = 67; m_preCastSpell = 67;
} }
} }
@@ -8776,7 +8776,7 @@ void Spell::PrepareTriggersExecutedOnHit()
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
{ {
// Faerie Fire (Feral) // Faerie Fire (Feral)
if( m_spellInfo->Id == 16857 && (m_caster->GetShapeshiftForm() == FORM_BEAR || m_caster->GetShapeshiftForm() == FORM_DIREBEAR) ) if (m_spellInfo->Id == 16857 && (m_caster->GetShapeshiftForm() == FORM_BEAR || m_caster->GetShapeshiftForm() == FORM_DIREBEAR))
m_preCastSpell = 60089; m_preCastSpell = 60089;
break; break;
+18 -18
View File
@@ -681,16 +681,16 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
// Trial of the Champion, Trample // Trial of the Champion, Trample
case 67866: case 67866:
{ {
if( unitTarget && !unitTarget->IsVehicle() && !unitTarget->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) ) if (unitTarget && !unitTarget->IsVehicle() && !unitTarget->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID))
unitTarget->CastSpell(unitTarget, 67867, false); unitTarget->CastSpell(unitTarget, 67867, false);
return; return;
} }
// Trial of the Champion, Hammer of the Righteous // Trial of the Champion, Hammer of the Righteous
case 66867: case 66867:
{ {
if( !unitTarget ) if (!unitTarget)
return; return;
if( unitTarget->HasAura(66940) ) if (unitTarget->HasAura(66940))
m_caster->CastSpell(unitTarget, 66903, true); m_caster->CastSpell(unitTarget, 66903, true);
else else
m_caster->CastSpell(unitTarget, 66904, true); m_caster->CastSpell(unitTarget, 66904, true);
@@ -699,12 +699,12 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
case 17731: case 17731:
case 69294: case 69294:
{ {
if( !gameObjTarget || gameObjTarget->GetRespawnTime() > GameTime::GetGameTime().count() ) if (!gameObjTarget || gameObjTarget->GetRespawnTime() > GameTime::GetGameTime().count())
return; return;
gameObjTarget->SetRespawnTime(10); gameObjTarget->SetRespawnTime(10);
gameObjTarget->SendCustomAnim(gameObjTarget->GetGoAnimProgress()); gameObjTarget->SendCustomAnim(gameObjTarget->GetGoAnimProgress());
if( Creature* trigger = gameObjTarget->SummonCreature(12758, *gameObjTarget, TEMPSUMMON_TIMED_DESPAWN, 1000) ) if (Creature* trigger = gameObjTarget->SummonCreature(12758, *gameObjTarget, TEMPSUMMON_TIMED_DESPAWN, 1000))
trigger->CastSpell(trigger, 17731, false); trigger->CastSpell(trigger, 17731, false);
return; return;
@@ -712,7 +712,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
// HoL, Arc Weld // HoL, Arc Weld
case 59086: case 59086:
{ {
if( m_caster && m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving() ) if (m_caster && m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving())
m_caster->CastSpell(m_caster, 59097, true); m_caster->CastSpell(m_caster, 59097, true);
return; return;
@@ -753,7 +753,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
break; break;
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
// Hunger for Blood // Hunger for Blood
if( m_spellInfo->Id == 51662 ) if (m_spellInfo->Id == 51662)
{ {
m_caster->CastSpell(m_caster, 63848, true); m_caster->CastSpell(m_caster, 63848, true);
return; return;
@@ -3126,7 +3126,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex)
uint32 petentry = m_spellInfo->Effects[effIndex].MiscValue; uint32 petentry = m_spellInfo->Effects[effIndex].MiscValue;
int32 duration = m_spellInfo->GetDuration(); int32 duration = m_spellInfo->GetDuration();
if(Player* modOwner = m_originalCaster->GetSpellModOwner()) if (Player* modOwner = m_originalCaster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
Player* owner = m_originalCaster->ToPlayer(); Player* owner = m_originalCaster->ToPlayer();
@@ -3448,7 +3448,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
case SPELLFAMILY_HUNTER: case SPELLFAMILY_HUNTER:
{ {
// Kill Shot // Kill Shot
if( m_spellInfo->SpellFamilyFlags[1] & 0x800000 ) if (m_spellInfo->SpellFamilyFlags[1] & 0x800000)
{ {
spell_bonus += int32(m_caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.4f); spell_bonus += int32(m_caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.4f);
} }
@@ -3469,7 +3469,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
{ {
float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue();
//Death Knight T8 Melee 4P Bonus //Death Knight T8 Melee 4P Bonus
if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736))
AddPct(disease_amt, aurEff->GetAmount()); AddPct(disease_amt, aurEff->GetAmount());
AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) / 2.0f); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) / 2.0f);
@@ -3501,7 +3501,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue();
//Death Knight T8 Melee 4P Bonus //Death Knight T8 Melee 4P Bonus
if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736))
AddPct(disease_amt, aurEff->GetAmount()); AddPct(disease_amt, aurEff->GetAmount());
AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID(), consumeDiseases) / 2.0f); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID(), consumeDiseases) / 2.0f);
@@ -3520,7 +3520,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
{ {
float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue();
//Death Knight T8 Melee 4P Bonus //Death Knight T8 Melee 4P Bonus
if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736))
AddPct(disease_amt, aurEff->GetAmount()); AddPct(disease_amt, aurEff->GetAmount());
AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID())); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()));
@@ -3945,7 +3945,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
} }
case 61263: // for item Intravenous Healing Potion (44698) case 61263: // for item Intravenous Healing Potion (44698)
{ {
if( !m_caster || !unitTarget ) if (!m_caster || !unitTarget)
return; return;
m_caster->CastSpell(m_caster, 61267, true); m_caster->CastSpell(m_caster, 61267, true);
@@ -3957,16 +3957,16 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
} }
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:
{ {
switch( m_spellInfo->Id ) switch (m_spellInfo->Id)
{ {
// Master of Subtlety // Master of Subtlety
case 31666: case 31666:
{ {
if( !unitTarget ) if (!unitTarget)
return; return;
Aura* mos = unitTarget->GetAura(31665); Aura* mos = unitTarget->GetAura(31665);
if( mos ) if (mos)
{ {
mos->SetMaxDuration(6000); mos->SetMaxDuration(6000);
mos->SetDuration(6000, true); mos->SetDuration(6000, true);
@@ -3977,11 +3977,11 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
// Overkill // Overkill
case 58428: case 58428:
{ {
if( !unitTarget ) if (!unitTarget)
return; return;
Aura* overkill = unitTarget->GetAura(58427); Aura* overkill = unitTarget->GetAura(58427);
if( overkill ) if (overkill)
{ {
overkill->SetMaxDuration(20000); overkill->SetMaxDuration(20000);
overkill->SetDuration(20000, true); overkill->SetDuration(20000, true);
+2 -2
View File
@@ -3038,7 +3038,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes()
{ {
if (spellInfo->Effects[j].Effect) if (spellInfo->Effects[j].Effect)
{ {
switch(spellInfo->Effects[j].Effect) switch (spellInfo->Effects[j].Effect)
{ {
case SPELL_EFFECT_SCHOOL_DAMAGE: case SPELL_EFFECT_SCHOOL_DAMAGE:
case SPELL_EFFECT_WEAPON_DAMAGE: case SPELL_EFFECT_WEAPON_DAMAGE:
@@ -3503,7 +3503,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes()
{ {
if (spellInfo->Effects[j].ApplyAuraName && spellInfo->Effects[j].TriggerSpell) if (spellInfo->Effects[j].ApplyAuraName && spellInfo->Effects[j].TriggerSpell)
{ {
switch(spellInfo->Effects[j].ApplyAuraName) switch (spellInfo->Effects[j].ApplyAuraName)
{ {
case SPELL_AURA_PERIODIC_TRIGGER_SPELL: case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
case SPELL_AURA_PERIODIC_TRIGGER_SPELL_FROM_CLIENT: case SPELL_AURA_PERIODIC_TRIGGER_SPELL_FROM_CLIENT:
@@ -194,7 +194,7 @@ public:
_events.Update(diff); _events.Update(diff);
switch(_events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_SPELL_FIREBLAST: case EVENT_SPELL_FIREBLAST:
DoCastVictim(SPELL_FIREBLAST); DoCastVictim(SPELL_FIREBLAST);
@@ -218,7 +218,7 @@ public:
_events.Update(diff); _events.Update(diff);
switch(_events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_SPELL_SHADOWBOLTVOLLEY: case EVENT_SPELL_SHADOWBOLTVOLLEY:
DoCastVictim(SPELL_SHADOWBOLTVOLLEY); DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
@@ -456,7 +456,7 @@ public:
{ {
case TYPE_RING_OF_LAW: case TYPE_RING_OF_LAW:
encounter[0] = data; encounter[0] = data;
switch(data) switch (data)
{ {
case IN_PROGRESS: case IN_PROGRESS:
TempSummonGrimstone = instance->SummonCreature(NPC_GRIMSTONE, GrimstonePositon); TempSummonGrimstone = instance->SummonCreature(NPC_GRIMSTONE, GrimstonePositon);
@@ -358,7 +358,7 @@ public:
} }
break; break;
case DATA_SOLAKAR_FLAMEWREATH: case DATA_SOLAKAR_FLAMEWREATH:
switch(data) switch (data)
{ {
case IN_PROGRESS: case IN_PROGRESS:
if (SolakarState == NOT_STARTED) if (SolakarState == NOT_STARTED)
@@ -242,7 +242,7 @@ struct boss_nightbane : public BossAI
_skeletonscheduler.Schedule(50ms, [this](TaskContext context) _skeletonscheduler.Schedule(50ms, [this](TaskContext context)
{ {
//spawns skeletons every 2 seconds until skeletonCount is reached //spawns skeletons every 2 seconds until skeletonCount is reached
if(_skeletonSpawnCounter < _skeletonCount) if (_skeletonSpawnCounter < _skeletonCount)
{ {
me->CastSpell(_skeletonSpawnPos.GetPositionX(), _skeletonSpawnPos.GetPositionY(), _skeletonSpawnPos.GetPositionZ(), SPELL_SUMMON_SKELETON, true); me->CastSpell(_skeletonSpawnPos.GetPositionX(), _skeletonSpawnPos.GetPositionY(), _skeletonSpawnPos.GetPositionZ(), SPELL_SUMMON_SKELETON, true);
_skeletonSpawnCounter++; _skeletonSpawnCounter++;
@@ -941,7 +941,7 @@ struct boss_julianne : public ScriptedAI
void DoAction(int32 action) override void DoAction(int32 action) override
{ {
switch(action) switch (action)
{ {
case ACTION_FAKING_DEATH: case ACTION_FAKING_DEATH:
isFakingDeath = false; isFakingDeath = false;
@@ -1138,7 +1138,7 @@ struct boss_romulo : public ScriptedAI
void DoAction(int32 action) override void DoAction(int32 action) override
{ {
switch(action) switch (action)
{ {
case ACTION_FAKING_DEATH: case ACTION_FAKING_DEATH:
isFakingDeath = false; isFakingDeath = false;
@@ -456,7 +456,7 @@ public:
uint32 NextStep(uint32 nextStep) uint32 NextStep(uint32 nextStep)
{ {
switch(nextStep) switch (nextStep)
{ {
case 1: case 1:
Talk(SAY_DIALOG_MEDIVH_1); Talk(SAY_DIALOG_MEDIVH_1);
@@ -140,7 +140,7 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch(type) switch (type)
{ {
case TYPE_MOGRAINE_AND_WHITE_EVENT: case TYPE_MOGRAINE_AND_WHITE_EVENT:
if (data == IN_PROGRESS) if (data == IN_PROGRESS)
@@ -317,7 +317,7 @@ public:
mograine->Kill(me, me, true); mograine->Kill(me, me, true);
return 0; return 0;
default: default:
if(mograine) if (mograine)
mograine->DespawnOrUnsummon(0); mograine->DespawnOrUnsummon(0);
return 0; return 0;
} }
@@ -468,7 +468,7 @@ public:
while (uint32 eventId = events.ExecuteEvent()) while (uint32 eventId = events.ExecuteEvent())
{ {
switch(eventId) switch (eventId)
{ {
case EVENT_SPELL_CRUSADER_STRIKE: case EVENT_SPELL_CRUSADER_STRIKE:
me->CastSpell(me->GetVictim(), SPELL_CRUSADER_STRIKE, true); me->CastSpell(me->GetVictim(), SPELL_CRUSADER_STRIKE, true);
@@ -417,7 +417,7 @@ public:
return; return;
} }
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 1: case 1:
me->CastSpell(me, BONE_ARMOR_SPELL, false); me->CastSpell(me, BONE_ARMOR_SPELL, false);
@@ -281,7 +281,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_RESTORE_COMBAT: case EVENT_RESTORE_COMBAT:
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
@@ -193,7 +193,7 @@ public:
{ {
me->RemoveAurasDueToSpell(67541); me->RemoveAurasDueToSpell(67541);
me->GetMotionMaster()->MoveCharge(11779.30f, -7065.43f, 24.92f, me->GetSpeed(MOVE_RUN), EVENT_CHARGE); me->GetMotionMaster()->MoveCharge(11779.30f, -7065.43f, 24.92f, me->GetSpeed(MOVE_RUN), EVENT_CHARGE);
switch(summon->GetEntry()) switch (summon->GetEntry())
{ {
case NPC_SCOURGE_ZOMBIE: case NPC_SCOURGE_ZOMBIE:
events.ScheduleEvent(EVENT_SPAWN_WAVE_2, 3000); events.ScheduleEvent(EVENT_SPAWN_WAVE_2, 3000);
@@ -517,7 +517,7 @@ public:
void WaypointReached(uint32 uiPointId) override void WaypointReached(uint32 uiPointId) override
{ {
switch(uiPointId) switch (uiPointId)
{ {
// Starting waypoint, After reaching uther and jaina // Starting waypoint, After reaching uther and jaina
case 0: case 0:
@@ -97,7 +97,7 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER:
case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER: case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER:
@@ -330,12 +330,12 @@ public:
instance->SetData(DATA_PYRAMID, PYRAMID_CAGES_OPEN); instance->SetData(DATA_PYRAMID, PYRAMID_CAGES_OPEN);
//setting gossip option as soon as the cages open //setting gossip option as soon as the cages open
if(Creature* bly = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BLY))) if (Creature* bly = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BLY)))
{ {
bly->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); bly->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
} }
if(Creature* weegli = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_WEEGLI))) if (Creature* weegli = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_WEEGLI)))
{ {
weegli->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); weegli->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
} }
@@ -256,7 +256,7 @@ public:
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) override
{ {
if(summon->GetEntry() != me->GetEntry()) if (summon->GetEntry() != me->GetEntry())
{ {
summon->GetMotionMaster()->MovePoint(0, *me, false); summon->GetMotionMaster()->MovePoint(0, *me, false);
summon->GetMotionMaster()->MoveFollow(me, 0.1f, 0.0f + M_PI * 0.3f * summons.size()); summon->GetMotionMaster()->MoveFollow(me, 0.1f, 0.0f + M_PI * 0.3f * summons.size());
@@ -48,7 +48,7 @@ public:
void OnCreatureCreate(Creature* pCreature) override void OnCreatureCreate(Creature* pCreature) override
{ {
switch(pCreature->GetEntry()) switch (pCreature->GetEntry())
{ {
case NPC_SARTHARION: case NPC_SARTHARION:
m_uiSartharionGUID = pCreature->GetGUID(); m_uiSartharionGUID = pCreature->GetGUID();
@@ -67,7 +67,7 @@ public:
ObjectGuid GetGuidData(uint32 uiData) const override ObjectGuid GetGuidData(uint32 uiData) const override
{ {
switch(uiData) switch (uiData)
{ {
case DATA_SARTHARION: case DATA_SARTHARION:
return m_uiSartharionGUID; return m_uiSartharionGUID;
@@ -84,7 +84,7 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
// Gonna Go When the Volcano Blows (10 player) (2047) // Gonna Go When the Volcano Blows (10 player) (2047)
case 7326: case 7326:
@@ -104,19 +104,19 @@ public:
{ {
events.Reset(); events.Reset();
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED); pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED);
} }
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) override
{ {
if( type == POINT_MOTION_TYPE && id == 1 ) if (type == POINT_MOTION_TYPE && id == 1)
me->SetFacingTo(3 * M_PI / 2); me->SetFacingTo(3 * M_PI / 2);
} }
void KilledUnit(Unit* who) override void KilledUnit(Unit* who) override
{ {
if( who->IsPlayer() ) if (who->IsPlayer())
{ {
Talk(SAY_EADRIC_KILL_PLAYER); Talk(SAY_EADRIC_KILL_PLAYER);
} }
@@ -129,7 +129,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_HAMMER_RIGHTEOUS, 25000); events.ScheduleEvent(EVENT_SPELL_HAMMER_RIGHTEOUS, 25000);
Talk(SAY_EADRIC_AGGRO); Talk(SAY_EADRIC_AGGRO);
me->CastSpell(me, SPELL_VENGEANCE, false); me->CastSpell(me, SPELL_VENGEANCE, false);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS); pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS);
} }
@@ -141,7 +141,7 @@ public:
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if( damage >= me->GetHealth() ) if (damage >= me->GetHealth())
{ {
damage = me->GetHealth() - 1; damage = me->GetHealth() - 1;
if (me->GetFaction() != FACTION_FRIENDLY) if (me->GetFaction() != FACTION_FRIENDLY)
@@ -156,7 +156,7 @@ public:
_EnterEvadeMode(); _EnterEvadeMode();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(true); me->SetImmuneToAll(true);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE); pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE);
} }
} }
@@ -164,15 +164,15 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -182,7 +182,7 @@ public:
events.Repeat(16s); events.Repeat(16s);
break; break;
case EVENT_SPELL_HAMMER_RIGHTEOUS: case EVENT_SPELL_HAMMER_RIGHTEOUS:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 55.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 55.0f, true))
{ {
Talk(SAY_EADRIC_EMOTE_HAMMER_RIGHTEOUS, target); Talk(SAY_EADRIC_EMOTE_HAMMER_RIGHTEOUS, target);
Talk(SAY_EADRIC_HAMMER_RIGHTEOUS); Talk(SAY_EADRIC_HAMMER_RIGHTEOUS);
@@ -224,26 +224,26 @@ public:
{ {
events.Reset(); events.Reset();
summoned = false; summoned = false;
if( MemoryGUID ) if (MemoryGUID)
{ {
if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID))
memory->DespawnOrUnsummon(); memory->DespawnOrUnsummon();
MemoryGUID.Clear(); MemoryGUID.Clear();
} }
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED); pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED);
} }
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) override
{ {
if( type == POINT_MOTION_TYPE && id == 1 ) if (type == POINT_MOTION_TYPE && id == 1)
me->SetFacingTo(3 * M_PI / 2); me->SetFacingTo(3 * M_PI / 2);
} }
void KilledUnit(Unit* who) override void KilledUnit(Unit* who) override
{ {
if( who->IsPlayer() ) if (who->IsPlayer())
{ {
Talk(SAY_PALETRESS_KILL_PLAYER); Talk(SAY_PALETRESS_KILL_PLAYER);
} }
@@ -256,22 +256,22 @@ public:
events.ScheduleEvent(EVENT_SPELL_SMITE, 2s, 3s); events.ScheduleEvent(EVENT_SPELL_SMITE, 2s, 3s);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Talk(SAY_PALETRESS_AGGRO); Talk(SAY_PALETRESS_AGGRO);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS); pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS);
} }
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == 1 ) if (param == 1)
{ {
MemoryGUID.Clear(); MemoryGUID.Clear();
me->RemoveAura(SPELL_SHIELD); me->RemoveAura(SPELL_SHIELD);
Talk(SAY_PALETRESS_MEMORY_DEATH); Talk(SAY_PALETRESS_MEMORY_DEATH);
} }
else if( param == (-1) ) else if (param == (-1))
{ {
if( MemoryGUID ) if (MemoryGUID)
if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID))
{ {
memory->DespawnOrUnsummon(); memory->DespawnOrUnsummon();
MemoryGUID.Clear(); MemoryGUID.Clear();
@@ -281,10 +281,10 @@ public:
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
//if( me->HasAura(SPELL_SHIELD) ) //if (me->HasAura(SPELL_SHIELD))
// return; // return;
if( damage >= me->GetHealth() ) if (damage >= me->GetHealth())
{ {
damage = me->GetHealth() - 1; damage = me->GetHealth() - 1;
@@ -299,7 +299,7 @@ public:
_EnterEvadeMode(); _EnterEvadeMode();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(true); me->SetImmuneToAll(true);
if( pInstance ) if (pInstance)
{ {
pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE); pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE);
pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68206); pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68206);
@@ -310,7 +310,7 @@ public:
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) override
{ {
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_MEMORY_ENTRY, summon->GetEntry()); pInstance->SetData(DATA_MEMORY_ENTRY, summon->GetEntry());
MemoryGUID = summon->GetGUID(); MemoryGUID = summon->GetGUID();
} }
@@ -324,12 +324,12 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( !summoned && HealthBelowPct(25) ) if (!summoned && HealthBelowPct(25))
{ {
me->InterruptNonMeleeSpells(true); me->InterruptNonMeleeSpells(true);
Talk(SAY_PALETRESS_MEMORY_SUMMON); Talk(SAY_PALETRESS_MEMORY_SUMMON);
@@ -343,32 +343,32 @@ public:
return; return;
} }
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_SMITE: case EVENT_SPELL_SMITE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_SMITE, false); me->CastSpell(target, SPELL_SMITE, false);
events.Repeat(3s, 4s); events.Repeat(3s, 4s);
break; break;
case EVENT_SPELL_HOLY_FIRE: case EVENT_SPELL_HOLY_FIRE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_HOLY_FIRE, false); me->CastSpell(target, SPELL_HOLY_FIRE, false);
events.Repeat(9s, 12s); events.Repeat(9s, 12s);
break; break;
case EVENT_SPELL_RENEW: case EVENT_SPELL_RENEW:
if( !MemoryGUID ) if (!MemoryGUID)
{ {
break; break;
} }
if( urand(0, 1) ) if (urand(0, 1))
me->CastSpell(me, SPELL_RENEW, false); me->CastSpell(me, SPELL_RENEW, false);
else if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) else if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID))
if( memory->IsAlive() ) if (memory->IsAlive())
me->CastSpell(memory, SPELL_RENEW, false); me->CastSpell(memory, SPELL_RENEW, false);
events.Repeat(15s, 17s); events.Repeat(15s, 17s);
break; break;
@@ -410,8 +410,8 @@ public:
void JustDied(Unit* /*killer*/) override void JustDied(Unit* /*killer*/) override
{ {
me->DespawnOrUnsummon(20000); me->DespawnOrUnsummon(20000);
if( pInstance ) if (pInstance)
if( Creature* paletress = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_PALETRESS)) ) if (Creature* paletress = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_PALETRESS)))
paletress->AI()->DoAction(1); paletress->AI()->DoAction(1);
} }
@@ -421,10 +421,10 @@ public:
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -436,7 +436,7 @@ public:
case EVENT_MEMORY_START_ATTACK: case EVENT_MEMORY_START_ATTACK:
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(false); me->SetImmuneToAll(false);
if( Unit* target = me->SelectNearestTarget(200.0f) ) if (Unit* target = me->SelectNearestTarget(200.0f))
{ {
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
@@ -447,12 +447,12 @@ public:
events.ScheduleEvent(EVENT_SPELL_WAKING_NIGHTMARE, 20s, 30s); events.ScheduleEvent(EVENT_SPELL_WAKING_NIGHTMARE, 20s, 30s);
break; break;
case EVENT_SPELL_OLD_WOUNDS: case EVENT_SPELL_OLD_WOUNDS:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true))
me->CastSpell(target, SPELL_OLD_WOUNDS, true); me->CastSpell(target, SPELL_OLD_WOUNDS, true);
events.Repeat(12s); events.Repeat(12s);
break; break;
case EVENT_SPELL_SHADOWS_PAST: case EVENT_SPELL_SHADOWS_PAST:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true))
me->CastSpell(target, SPELL_SHADOWS_PAST, false); me->CastSpell(target, SPELL_SHADOWS_PAST, false);
events.Repeat(15s, 20s); events.Repeat(15s, 20s);
break; break;
@@ -541,9 +541,9 @@ public:
void WaypointReached(uint32 uiPoint) override void WaypointReached(uint32 uiPoint) override
{ {
if( uiPoint == 1 ) if (uiPoint == 1)
{ {
switch( uiWaypoint ) switch (uiWaypoint)
{ {
case 0: case 0:
me->SetFacingTo(5.4f); me->SetFacingTo(5.4f);
@@ -561,10 +561,10 @@ public:
void SetData(uint32 uiType, uint32 /*uiData*/) override void SetData(uint32 uiType, uint32 /*uiData*/) override
{ {
AddWaypoint(0, me->GetPositionX(), 660.0f, 411.80f); AddWaypoint(0, me->GetPositionX(), 660.0f, 411.80f);
switch( me->GetEntry() ) switch (me->GetEntry())
{ {
case NPC_ARGENT_LIGHTWIELDER: case NPC_ARGENT_LIGHTWIELDER:
switch( uiType ) switch (uiType)
{ {
case 0: case 0:
AddWaypoint(1, 716.321f, 647.047f, 411.93f); AddWaypoint(1, 716.321f, 647.047f, 411.93f);
@@ -578,7 +578,7 @@ public:
} }
break; break;
case NPC_ARGENT_MONK: case NPC_ARGENT_MONK:
switch( uiType ) switch (uiType)
{ {
case 0: case 0:
AddWaypoint(1, 717.86f, 649.0f, 411.923f); AddWaypoint(1, 717.86f, 649.0f, 411.923f);
@@ -592,7 +592,7 @@ public:
} }
break; break;
case NPC_PRIESTESS: case NPC_PRIESTESS:
switch( uiType ) switch (uiType)
{ {
case 0: case 0:
AddWaypoint(1, 719.872f, 650.94f, 411.93f); AddWaypoint(1, 719.872f, 650.94f, 411.93f);
@@ -613,7 +613,7 @@ public:
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if( bCheck && damage >= me->GetHealth() ) if (bCheck && damage >= me->GetHealth())
{ {
bCheck = false; bCheck = false;
damage = me->GetHealth() - 1; damage = me->GetHealth() - 1;
@@ -625,25 +625,25 @@ public:
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
switch( me->GetEntry() ) switch (me->GetEntry())
{ {
case NPC_ARGENT_MONK: case NPC_ARGENT_MONK:
events.RescheduleEvent(EVENT_MONK_SPELL_FLURRY_OF_BLOWS, 5s); events.RescheduleEvent(EVENT_MONK_SPELL_FLURRY_OF_BLOWS, 5s);
events.RescheduleEvent(EVENT_MONK_SPELL_PUMMEL, 7s); events.RescheduleEvent(EVENT_MONK_SPELL_PUMMEL, 7s);
if( IsHeroic() ) if (IsHeroic())
bCheck = true; bCheck = true;
break; break;
case NPC_PRIESTESS: case NPC_PRIESTESS:
events.RescheduleEvent(EVENT_PRIESTESS_SPELL_HOLY_SMITE, 5s, 8s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_HOLY_SMITE, 5s, 8s);
events.RescheduleEvent(EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN, 3s, 6s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN, 3s, 6s);
events.RescheduleEvent(EVENT_PRIESTESS_SPELL_FOUNTAIN_OF_LIGHT, 8s, 15s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_FOUNTAIN_OF_LIGHT, 8s, 15s);
if( IsHeroic() ) if (IsHeroic())
events.RescheduleEvent(EVENT_PRIESTESS_SPELL_MIND_CONTROL_H, 12s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_MIND_CONTROL_H, 12s);
break; break;
case NPC_ARGENT_LIGHTWIELDER: case NPC_ARGENT_LIGHTWIELDER:
events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT, 12s, 15s); events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT, 12s, 15s);
events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_CLEAVE, 3s, 5s); events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_CLEAVE, 3s, 5s);
if( IsHeroic() ) if (IsHeroic())
events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H, 8s, 12s); events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H, 8s, 12s);
break; break;
} }
@@ -653,15 +653,15 @@ public:
{ {
npc_escortAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff);
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -671,18 +671,18 @@ public:
events.Repeat(12s, 18s); events.Repeat(12s, 18s);
break; break;
case EVENT_MONK_SPELL_PUMMEL: case EVENT_MONK_SPELL_PUMMEL:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_PUMMEL, false); me->CastSpell(me->GetVictim(), SPELL_PUMMEL, false);
events.Repeat(8s, 11s); events.Repeat(8s, 11s);
break; break;
case EVENT_PRIESTESS_SPELL_HOLY_SMITE: case EVENT_PRIESTESS_SPELL_HOLY_SMITE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_HOLY_SMITE, false); me->CastSpell(me->GetVictim(), SPELL_HOLY_SMITE, false);
events.Repeat(6s, 8s); events.Repeat(6s, 8s);
break; break;
case EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN: case EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_SHADOW_WORD_PAIN, false); me->CastSpell(me->GetVictim(), SPELL_SHADOW_WORD_PAIN, false);
events.Repeat(12s, 15s); events.Repeat(12s, 15s);
break; break;
@@ -691,7 +691,7 @@ public:
events.Repeat(35s, 45s); events.Repeat(35s, 45s);
break; break;
case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H: case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_MIND_CONTROL_H, false); me->CastSpell(target, SPELL_MIND_CONTROL_H, false);
events.Repeat(22s, 30s); events.Repeat(22s, 30s);
break; break;
@@ -699,19 +699,19 @@ public:
case EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT: case EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT:
{ {
Unit* target = DoSelectLowestHpFriendly(40.0f); Unit* target = DoSelectLowestHpFriendly(40.0f);
if( !target ) if (!target)
target = me; target = me;
me->CastSpell(target, SPELL_BLAZING_LIGHT, false); me->CastSpell(target, SPELL_BLAZING_LIGHT, false);
events.Repeat(8s, 12s); events.Repeat(8s, 12s);
} }
break; break;
case EVENT_LIGHTWIELDER_SPELL_CLEAVE: case EVENT_LIGHTWIELDER_SPELL_CLEAVE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false); me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false);
events.Repeat(6s, 8s); events.Repeat(6s, 8s);
break; break;
case EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H: case EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_UNBALANCING_STRIKE_H, false); me->CastSpell(me->GetVictim(), SPELL_UNBALANCING_STRIKE_H, false);
events.Repeat(12s, 15s); events.Repeat(12s, 15s);
break; break;
@@ -723,7 +723,7 @@ public:
void JustDied(Unit* /*pKiller*/) override void JustDied(Unit* /*pKiller*/) override
{ {
me->DespawnOrUnsummon(10000); me->DespawnOrUnsummon(10000);
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, 0); pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, 0);
} }
}; };
@@ -742,7 +742,7 @@ class spell_eadric_radiance : public SpellScript
{ {
std::list<WorldObject*> tmplist; std::list<WorldObject*> tmplist;
for( std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) for( std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
if( (*itr)->ToUnit()->HasInArc(M_PI, GetCaster()) ) if ((*itr)->ToUnit()->HasInArc(M_PI, GetCaster()))
tmplist.push_back(*itr); tmplist.push_back(*itr);
targets.clear(); targets.clear();
@@ -798,8 +798,8 @@ class spell_reflective_shield_aura : public AuraScript
void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& dmgInfo, uint32& absorbAmount) void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& dmgInfo, uint32& absorbAmount)
{ {
if( Unit* attacker = dmgInfo.GetAttacker() ) if (Unit* attacker = dmgInfo.GetAttacker())
if( GetOwner() && attacker->GetGUID() != GetOwner()->GetGUID() ) if (GetOwner() && attacker->GetGUID() != GetOwner()->GetGUID())
{ {
int32 damage = (int32)(absorbAmount * 0.25f); int32 damage = (int32)(absorbAmount * 0.25f);
GetOwner()->ToUnit()->CastCustomSpell(attacker, SPELL_REFLECTIVE_SHIELD_DAMAGE, &damage, nullptr, nullptr, true); GetOwner()->ToUnit()->CastCustomSpell(attacker, SPELL_REFLECTIVE_SHIELD_DAMAGE, &damage, nullptr, nullptr, true);
@@ -123,7 +123,7 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(true); me->SetImmuneToAll(true);
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_BLACK_KNIGHT, NOT_STARTED); pInstance->SetData(BOSS_BLACK_KNIGHT, NOT_STARTED);
//me->SetLootMode(0); // [LOOT] //me->SetLootMode(0); // [LOOT]
@@ -143,7 +143,7 @@ public:
return; return;
} }
if( Phase < 3 && damage >= me->GetHealth() ) if (Phase < 3 && damage >= me->GetHealth())
{ {
damage = 0; damage = 0;
me->SetHealth(me->GetMaxHealth()); me->SetHealth(me->GetMaxHealth());
@@ -164,19 +164,19 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == -1 ) if (param == -1)
{ {
summons.DespawnAll(); summons.DespawnAll();
} }
else if( param == 1 ) else if (param == 1)
{ {
if( !pInstance ) if (!pInstance)
return; return;
pInstance->SetData(BOSS_BLACK_KNIGHT, IN_PROGRESS); pInstance->SetData(BOSS_BLACK_KNIGHT, IN_PROGRESS);
Talk(SAY_BK_AGGRO); Talk(SAY_BK_AGGRO);
me->CastSpell((Unit*)nullptr, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false); me->CastSpell((Unit*)nullptr, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false);
if( Creature* announcer = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_ANNOUNCER)) ) if (Creature* announcer = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_ANNOUNCER)))
announcer->DespawnOrUnsummon(); announcer->DespawnOrUnsummon();
events.Reset(); events.Reset();
@@ -190,7 +190,7 @@ public:
void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override
{ {
switch( spell->Id ) switch (spell->Id)
{ {
case SPELL_BLACK_KNIGHT_RES: case SPELL_BLACK_KNIGHT_RES:
me->SetHealth(me->GetMaxHealth()); me->SetHealth(me->GetMaxHealth());
@@ -205,7 +205,7 @@ public:
++Phase; ++Phase;
switch( Phase ) switch (Phase)
{ {
case 2: case 2:
me->SetDisplayId(MODEL_SKELETON); me->SetDisplayId(MODEL_SKELETON);
@@ -236,46 +236,46 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_ANNOUNCER_SAY_ZOMBIE: case EVENT_ANNOUNCER_SAY_ZOMBIE:
if( pInstance && !summons.empty() ) if (pInstance && !summons.empty())
if( Creature* ghoul = pInstance->instance->GetCreature(*summons.begin()) ) if (Creature* ghoul = pInstance->instance->GetCreature(*summons.begin()))
if (urand(0, 1)) if (urand(0, 1))
ghoul->Yell("[Zombie] .... . Brains ....", LANG_UNIVERSAL); /// @todo: Multiple variations + not always happening, from video sources, needs sniff to transition from DB. ghoul->Yell("[Zombie] .... . Brains ....", LANG_UNIVERSAL); /// @todo: Multiple variations + not always happening, from video sources, needs sniff to transition from DB.
break; break;
case EVENT_SPELL_PLAGUE_STRIKE: case EVENT_SPELL_PLAGUE_STRIKE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_PLAGUE_STRIKE, false); me->CastSpell(me->GetVictim(), SPELL_PLAGUE_STRIKE, false);
events.Repeat(10s, 12s); events.Repeat(10s, 12s);
break; break;
case EVENT_SPELL_ICY_TOUCH: case EVENT_SPELL_ICY_TOUCH:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_ICY_TOUCH, false); me->CastSpell(me->GetVictim(), SPELL_ICY_TOUCH, false);
events.Repeat(5s, 6s); events.Repeat(5s, 6s);
break; break;
case EVENT_SPELL_DEATH_RESPITE: case EVENT_SPELL_DEATH_RESPITE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_DEATH_RESPITE, false); me->CastSpell(target, SPELL_DEATH_RESPITE, false);
events.Repeat(13s, 15s); events.Repeat(13s, 15s);
break; break;
case EVENT_SPELL_OBLITERATE: case EVENT_SPELL_OBLITERATE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_OBLITERATE, false); me->CastSpell(me->GetVictim(), SPELL_OBLITERATE, false);
events.Repeat(15s, 17s); events.Repeat(15s, 17s);
break; break;
case EVENT_SPELL_DESECRATION: case EVENT_SPELL_DESECRATION:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_DESECRATION, false); me->CastSpell(target, SPELL_DESECRATION, false);
events.Repeat(14s, 17s); events.Repeat(14s, 17s);
break; break;
@@ -284,7 +284,7 @@ public:
events.Repeat(2s, 4s); events.Repeat(2s, 4s);
break; break;
case EVENT_SPELL_MARKED_DEATH: case EVENT_SPELL_MARKED_DEATH:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.000000f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.000000f, true))
me->CastSpell(target, SPELL_MARKED_DEATH, false); me->CastSpell(target, SPELL_MARKED_DEATH, false);
events.Repeat(9s); events.Repeat(9s);
break; break;
@@ -296,7 +296,7 @@ public:
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) override
{ {
summons.Summon(summon); summons.Summon(summon);
if( Unit* target = summon->SelectNearestTarget(200.0f) ) if (Unit* target = summon->SelectNearestTarget(200.0f))
{ {
summon->AI()->AttackStart(target); summon->AI()->AttackStart(target);
DoZoneInCombat(summon); DoZoneInCombat(summon);
@@ -305,7 +305,7 @@ public:
void KilledUnit(Unit* victim) override void KilledUnit(Unit* victim) override
{ {
if( victim->IsPlayer() ) if (victim->IsPlayer())
{ {
Talk(SAY_BK_KILL_PLAYER); Talk(SAY_BK_KILL_PLAYER);
} }
@@ -315,9 +315,9 @@ public:
{ {
me->CastSpell((Unit*)nullptr, SPELL_BK_KILL_CREDIT, true); me->CastSpell((Unit*)nullptr, SPELL_BK_KILL_CREDIT, true);
Talk(SAY_BK_DEATH); Talk(SAY_BK_DEATH);
if( pInstance ) if (pInstance)
pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); pInstance->SetData(BOSS_BLACK_KNIGHT, DONE);
if( me->ToTempSummon() ) if (me->ToTempSummon())
me->ToTempSummon()->SetTempSummonType(TEMPSUMMON_MANUAL_DESPAWN); me->ToTempSummon()->SetTempSummonType(TEMPSUMMON_MANUAL_DESPAWN);
} }
}; };
@@ -347,7 +347,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == 1 ) if (param == 1)
{ {
me->SetControlled(false, UNIT_STATE_ROOT); me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false); me->DisableRotate(false);
@@ -358,7 +358,7 @@ public:
void WaypointReached(uint32 i) override void WaypointReached(uint32 i) override
{ {
if( i == 12 ) if (i == 12)
{ {
SetEscortPaused(true); SetEscortPaused(true);
me->SetOrientation(3.62f); me->SetOrientation(3.62f);
@@ -366,7 +366,7 @@ public:
me->DisableRotate(true); me->DisableRotate(true);
me->SetFacingTo(3.62f); me->SetFacingTo(3.62f);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_MOUNT_SPECIAL); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_MOUNT_SPECIAL);
if( InstanceScript* pInstance = me->GetInstanceScript() ) if (InstanceScript* pInstance = me->GetInstanceScript())
pInstance->SetData(DATA_SKELETAL_GRYPHON_LANDED, 0); pInstance->SetData(DATA_SKELETAL_GRYPHON_LANDED, 0);
} }
} }
@@ -422,7 +422,7 @@ public:
void SpellHitTarget(Unit* target, SpellInfo const* spell) override void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{ {
switch(spell->Id) switch (spell->Id)
{ {
case SPELL_CLAW_N: case SPELL_CLAW_N:
case SPELL_CLAW_H: case SPELL_CLAW_H:
@@ -443,15 +443,15 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -173,7 +173,7 @@ public:
if (me->IsDuringRemoveFromWorld()) if (me->IsDuringRemoveFromWorld())
return; return;
if( apply ) if (apply)
{ {
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetSpeed(MOVE_RUN, 2.0f, false); me->SetSpeed(MOVE_RUN, 2.0f, false);
@@ -193,7 +193,7 @@ public:
if (me->IsDuringRemoveFromWorld()) if (me->IsDuringRemoveFromWorld())
return; return;
if( !apply ) if (!apply)
{ {
me->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND); me->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND);
who->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND); who->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND);
@@ -260,7 +260,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( ShieldTimer <= (int32)diff ) if (ShieldTimer <= (int32)diff )
{ {
me->CastSpell(me, SPELL_MINIONS_DEFEND, true); me->CastSpell(me, SPELL_MINIONS_DEFEND, true);
ShieldTimer = 5000; ShieldTimer = 5000;
@@ -268,15 +268,15 @@ public:
else else
ShieldTimer -= diff; ShieldTimer -= diff;
if ( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -285,22 +285,22 @@ public:
GuidVector LIST; GuidVector LIST;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
{ {
if( me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead() ) if (me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead())
continue; continue;
if( !plr->GetVehicle() ) if (!plr->GetVehicle())
LIST.push_back(plr->GetGUID()); LIST.push_back(plr->GetGUID());
else if( Vehicle* v = plr->GetVehicle() ) else if (Vehicle* v = plr->GetVehicle())
{ {
if( Unit* mount = v->GetBase() ) if (Unit* mount = v->GetBase())
LIST.push_back(mount->GetGUID()); LIST.push_back(mount->GetGUID());
} }
} }
if( !LIST.empty() ) if (!LIST.empty())
{ {
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) if (Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)))
{ {
me->GetThreatMgr().ResetAllThreat(); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 10000.0f); me->AddThreat(target, 10000.0f);
@@ -316,25 +316,25 @@ public:
GuidVector LIST; GuidVector LIST;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
{ {
if( me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) if (me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f )
continue; continue;
if( Vehicle* v = plr->GetVehicle() ) if (Vehicle* v = plr->GetVehicle())
if( Unit* mount = v->GetBase() ) if (Unit* mount = v->GetBase())
LIST.push_back(mount->GetGUID()); LIST.push_back(mount->GetGUID());
} }
if( !LIST.empty() ) if (!LIST.empty())
{ {
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)) ) if (Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)))
me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false); me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false);
} }
events.Repeat(6s, 8s); events.Repeat(6s, 8s);
} }
break; break;
case EVENT_THRUST: case EVENT_THRUST:
if( me->GetVictim() && me->GetExactDist(me->GetVictim()) <= 5.5f ) if (me->GetVictim() && me->GetExactDist(me->GetVictim()) <= 5.5f )
me->CastSpell(me->GetVictim(), SPELL_PLAYER_VEHICLE_THRUST, false); me->CastSpell(me->GetVictim(), SPELL_PLAYER_VEHICLE_THRUST, false);
events.Repeat(3s, 5s); events.Repeat(3s, 5s);
break; break;
@@ -345,7 +345,7 @@ public:
{ {
me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0); me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0);
me->DespawnOrUnsummon(10000); me->DespawnOrUnsummon(10000);
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_MOUNT_DIED, 0); pInstance->SetData(DATA_MOUNT_DIED, 0);
} }
}; };
@@ -402,7 +402,7 @@ public:
void Reset() override void Reset() override
{ {
if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED )
{ {
DoAction(1); DoAction(1);
DoAction(2); DoAction(2);
@@ -415,7 +415,7 @@ public:
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED )
me->CallForHelp(100.0f); me->CallForHelp(100.0f);
} }
@@ -423,7 +423,7 @@ public:
{ {
me->m_spellImmune[IMMUNITY_MECHANIC].clear(); me->m_spellImmune[IMMUNITY_MECHANIC].clear();
events.Reset(); events.Reset();
switch( me->GetEntry() ) switch (me->GetEntry())
{ {
case NPC_AMBROSE: // Ambrose Boltspark case NPC_AMBROSE: // Ambrose Boltspark
case NPC_ERESSEA: // Eressea Dawnsinger case NPC_ERESSEA: // Eressea Dawnsinger
@@ -485,7 +485,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == 1 ) if (param == 1)
{ {
MountPhase = false; MountPhase = false;
NewMountGUID.Clear(); NewMountGUID.Clear();
@@ -500,16 +500,16 @@ public:
AddCreatureAddonAuras(); AddCreatureAddonAuras();
events.Reset(); events.Reset();
} }
else if( param == 2 ) else if (param == 2)
ScheduleAbilitiesEvents(); ScheduleAbilitiesEvents();
} }
void SetData(uint32 uiType, uint32 uiData) override void SetData(uint32 uiType, uint32 uiData) override
{ {
BossOrder = uiType; BossOrder = uiType;
if( uiData > 1 ) if (uiData > 1)
return; return;
switch( BossOrder ) switch (BossOrder)
{ {
case 0: case 0:
if (uiData == 0) // 1 == short version if (uiData == 0) // 1 == short version
@@ -545,11 +545,11 @@ public:
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if( MountPhase ) if (MountPhase)
{ {
if( me->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) == 0 ) if (me->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) == 0 )
damage = 0; damage = 0;
else if( damage >= me->GetHealth() ) else if (damage >= me->GetHealth())
{ {
events.Reset(); events.Reset();
damage = me->GetHealth() - 1; damage = me->GetHealth() - 1;
@@ -565,10 +565,10 @@ public:
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(true); me->SetImmuneToAll(true);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if( pInstance ) if (pInstance)
{ {
pInstance->SetData(DATA_MOUNT_DIED, BossOrder); pInstance->SetData(DATA_MOUNT_DIED, BossOrder);
if( Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ) ) if (Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ))
{ {
NewMountGUID = mount->GetGUID(); NewMountGUID = mount->GetGUID();
me->GetMotionMaster()->MovePoint(7, *mount); me->GetMotionMaster()->MovePoint(7, *mount);
@@ -579,7 +579,7 @@ public:
} }
else else
{ {
if( damage >= me->GetHealth() ) if (damage >= me->GetHealth())
{ {
MountPhase = true; MountPhase = true;
events.Reset(); events.Reset();
@@ -593,7 +593,7 @@ public:
me->SetRegeneratingHealth(false); me->SetRegeneratingHealth(false);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(true); me->SetImmuneToAll(true);
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_GRAND_CHAMPION_DIED, BossOrder); pInstance->SetData(DATA_GRAND_CHAMPION_DIED, BossOrder);
} }
} }
@@ -603,26 +603,26 @@ public:
void WaypointReached(uint32 i) override void WaypointReached(uint32 i) override
{ {
if( !pInstance ) if (!pInstance)
return; return;
if( (i == 2 && (BossOrder == 1 || BossOrder == 2)) || (i == 3 && BossOrder == 0) ) if ((i == 2 && (BossOrder == 1 || BossOrder == 2)) || (i == 3 && BossOrder == 0))
pInstance->SetData(DATA_GRAND_CHAMPION_REACHED_DEST, BossOrder); pInstance->SetData(DATA_GRAND_CHAMPION_REACHED_DEST, BossOrder);
} }
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) override
{ {
if( id < 4 ) if (id < 4)
npc_escortAI::MovementInform(type, id); npc_escortAI::MovementInform(type, id);
if( type == POINT_MOTION_TYPE ) if (type == POINT_MOTION_TYPE)
{ {
if( id == 5 ) if (id == 5)
me->SetFacingTo(3 * M_PI / 2); me->SetFacingTo(3 * M_PI / 2);
else if( id == 7 ) // reached new mount! else if (id == 7) // reached new mount!
{ {
if( NewMountGUID ) if (NewMountGUID)
if( Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID) ) if (Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID))
{ {
mount->DespawnOrUnsummon(); mount->DespawnOrUnsummon();
me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, mount->GetDisplayId()); me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, mount->GetDisplayId());
@@ -637,16 +637,16 @@ public:
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->SetImmuneToAll(false); me->SetImmuneToAll(false);
if( Unit* target = me->SelectNearestTarget(200.0f) ) if (Unit* target = me->SelectNearestTarget(200.0f))
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
me->CastSpell(me, SPELL_TRAMPLE_AURA, true); me->CastSpell(me, SPELL_TRAMPLE_AURA, true);
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_REACHED_NEW_MOUNT, 0); pInstance->SetData(DATA_REACHED_NEW_MOUNT, 0);
NewMountGUID.Clear(); NewMountGUID.Clear();
} }
} }
else if( id == 9 ) else if (id == 9)
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
} }
} }
@@ -661,37 +661,37 @@ public:
{ {
npc_escortAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff);
if ( !UpdateVictim() && !NewMountGUID ) if (!UpdateVictim() && !NewMountGUID )
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) || ((me->GetEntry() == NPC_JACOB || me->GetEntry() == NPC_MOKRA) && me->HasAura(SPELL_BLADESTORM)) ) if (me->HasUnitState(UNIT_STATE_CASTING) || ((me->GetEntry() == NPC_JACOB || me->GetEntry() == NPC_MOKRA) && me->HasAura(SPELL_BLADESTORM)))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_FIND_NEW_MOUNT: case EVENT_FIND_NEW_MOUNT:
{ {
if( me->HasAura(SPELL_TRAMPLE_STUN) ) if (me->HasAura(SPELL_TRAMPLE_STUN))
{ {
events.Repeat(200ms); events.Repeat(200ms);
break; break;
} }
// hackfix, trample won't hit grand champions because of UNIT_FLAG_NON_ATTACKABLE // hackfix, trample won't hit grand champions because of UNIT_FLAG_NON_ATTACKABLE
if( pInstance ) if (pInstance)
{ {
bool trample = false; bool trample = false;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
if( me->GetExactDist(plr) <= 5.0f ) if (me->GetExactDist(plr) <= 5.0f )
if( Vehicle* v = plr->GetVehicle() ) if (Vehicle* v = plr->GetVehicle())
if( Unit* c = v->GetBase() ) if (Unit* c = v->GetBase())
if( c->IsCreature() && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) ) if (c->IsCreature() && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE))
{ {
me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
@@ -701,23 +701,23 @@ public:
break; break;
} }
if( trample ) if (trample)
{ {
events.Repeat(15s); events.Repeat(15s);
break; break;
} }
} }
if( Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID) ) if (Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID))
if( mount->IsAlive() ) if (mount->IsAlive())
{ {
if( me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE )
me->GetMotionMaster()->MovePoint(7, *mount); me->GetMotionMaster()->MovePoint(7, *mount);
events.Repeat(200ms); events.Repeat(200ms);
break; break;
} }
if( Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ) ) if (Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ))
{ {
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
NewMountGUID = mount->GetGUID(); NewMountGUID = mount->GetGUID();
@@ -734,22 +734,22 @@ public:
GuidVector LIST; GuidVector LIST;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
{ {
if( me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead() ) if (me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead())
continue; continue;
if( !plr->GetVehicle() ) if (!plr->GetVehicle())
LIST.push_back(plr->GetGUID()); LIST.push_back(plr->GetGUID());
else if( Vehicle* v = plr->GetVehicle() ) else if (Vehicle* v = plr->GetVehicle())
{ {
if( Unit* mount = v->GetBase() ) if (Unit* mount = v->GetBase())
LIST.push_back(mount->GetGUID()); LIST.push_back(mount->GetGUID());
} }
} }
if( !LIST.empty() ) if (!LIST.empty())
{ {
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) if (Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)))
{ {
me->GetThreatMgr().ResetAllThreat(); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 10000.0f); me->AddThreat(target, 10000.0f);
@@ -765,33 +765,33 @@ public:
GuidVector LIST; GuidVector LIST;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
{ {
if( me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) if (me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f )
continue; continue;
if( Vehicle* v = plr->GetVehicle() ) if (Vehicle* v = plr->GetVehicle())
if( Unit* mount = v->GetBase() ) if (Unit* mount = v->GetBase())
LIST.push_back(mount->GetGUID()); LIST.push_back(mount->GetGUID());
} }
if( !LIST.empty() ) if (!LIST.empty())
{ {
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)) ) if (Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)))
me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false); me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false);
} }
events.Repeat(6s, 8s); events.Repeat(6s, 8s);
} }
break; break;
case EVENT_THRUST: case EVENT_THRUST:
if( Unit* victim = me->GetVictim() ) if (Unit* victim = me->GetVictim())
if( me->GetExactDist(victim) <= 6.0f ) if (me->GetExactDist(victim) <= 6.0f )
me->CastSpell(victim, SPELL_PLAYER_VEHICLE_THRUST, false); me->CastSpell(victim, SPELL_PLAYER_VEHICLE_THRUST, false);
events.Repeat(3s, 5s); events.Repeat(3s, 5s);
break; break;
/******************* MAGE *******************/ /******************* MAGE *******************/
case EVEMT_MAGE_SPELL_FIREBALL: case EVEMT_MAGE_SPELL_FIREBALL:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_FIREBALL, false); me->CastSpell(me->GetVictim(), SPELL_FIREBALL, false);
events.Repeat(5s); events.Repeat(5s);
break; break;
@@ -804,7 +804,7 @@ public:
events.Repeat(22s); events.Repeat(22s);
break; break;
case EVEMT_MAGE_SPELL_POLYMORPH: case EVEMT_MAGE_SPELL_POLYMORPH:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_POLYMORPH, false); me->CastSpell(target, SPELL_POLYMORPH, false);
events.Repeat(8s); events.Repeat(8s);
break; break;
@@ -812,7 +812,7 @@ public:
/****************** SHAMAN ******************/ /****************** SHAMAN ******************/
case EVENT_SHAMAN_SPELL_CHAIN_LIGHTNING: case EVENT_SHAMAN_SPELL_CHAIN_LIGHTNING:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false);
events.Repeat(16s); events.Repeat(16s);
break; break;
@@ -823,10 +823,10 @@ public:
case EVENT_SHAMAN_SPELL_HEALING_WAVE: case EVENT_SHAMAN_SPELL_HEALING_WAVE:
{ {
Unit* target = nullptr; Unit* target = nullptr;
if( urand(0, 1) ) if (urand(0, 1))
{ {
target = DoSelectLowestHpFriendly(40.0f); target = DoSelectLowestHpFriendly(40.0f);
if( !target ) if (!target)
target = me; target = me;
} }
else else
@@ -836,7 +836,7 @@ public:
} }
break; break;
case EVENT_SHAMAN_SPELL_HEX_OF_MENDING: case EVENT_SHAMAN_SPELL_HEX_OF_MENDING:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_HEX_OF_MENDING, false); me->CastSpell(me->GetVictim(), SPELL_HEX_OF_MENDING, false);
events.Repeat(20s, 25s); events.Repeat(20s, 25s);
break; break;
@@ -852,9 +852,9 @@ public:
break; break;
case EVENT_HUNTER_SPELL_MULTI_SHOT: case EVENT_HUNTER_SPELL_MULTI_SHOT:
{ {
if( !UnitTargetGUID ) if (!UnitTargetGUID)
{ {
if( Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true))
{ {
me->CastSpell(target, SPELL_SHOOT, false); me->CastSpell(target, SPELL_SHOOT, false);
UnitTargetGUID = target->GetGUID(); UnitTargetGUID = target->GetGUID();
@@ -865,7 +865,7 @@ public:
else else
{ {
Unit* target = ObjectAccessor::GetUnit(*me, UnitTargetGUID); Unit* target = ObjectAccessor::GetUnit(*me, UnitTargetGUID);
if( target && me->IsInRange(target, 5.0f, 30.0f, false) ) if (target && me->IsInRange(target, 5.0f, 30.0f, false))
me->CastSpell(target, SPELL_MULTI_SHOT, false); me->CastSpell(target, SPELL_MULTI_SHOT, false);
else else
{ {
@@ -873,7 +873,7 @@ public:
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
{ {
Player* player = itr->GetSource(); Player* player = itr->GetSource();
if( player && me->IsInRange(player, 5.0f, 30.0f, false) ) if (player && me->IsInRange(player, 5.0f, 30.0f, false))
{ {
me->CastSpell(player, SPELL_MULTI_SHOT, false); me->CastSpell(player, SPELL_MULTI_SHOT, false);
break; break;
@@ -889,7 +889,7 @@ public:
/****************** ROGUE *******************/ /****************** ROGUE *******************/
case EVENT_ROGUE_SPELL_EVISCERATE: case EVENT_ROGUE_SPELL_EVISCERATE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_EVISCERATE, false); me->CastSpell(me->GetVictim(), SPELL_EVISCERATE, false);
events.Repeat(8s); events.Repeat(8s);
break; break;
@@ -898,7 +898,7 @@ public:
events.Repeat(14s); events.Repeat(14s);
break; break;
case EVENT_ROGUE_SPELL_POISON_BOTTLE: case EVENT_ROGUE_SPELL_POISON_BOTTLE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_POISON_BOTTLE, false); me->CastSpell(target, SPELL_POISON_BOTTLE, false);
events.Repeat(19s); events.Repeat(19s);
break; break;
@@ -906,12 +906,12 @@ public:
/***************** WARRIOR ******************/ /***************** WARRIOR ******************/
case EVENT_WARRIOR_SPELL_MORTAL_STRIKE: case EVENT_WARRIOR_SPELL_MORTAL_STRIKE:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_MORTAL_STRIKE, false); me->CastSpell(me->GetVictim(), SPELL_MORTAL_STRIKE, false);
events.Repeat(8s, 12s); events.Repeat(8s, 12s);
break; break;
case EVENT_WARRIOR_SPELL_BLADESTORM: case EVENT_WARRIOR_SPELL_BLADESTORM:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_BLADESTORM, false); me->CastSpell(me->GetVictim(), SPELL_BLADESTORM, false);
events.Repeat(15s, 20s); events.Repeat(15s, 20s);
break; break;
@@ -921,7 +921,7 @@ public:
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
{ {
Player* player = itr->GetSource(); Player* player = itr->GetSource();
if( player && me->IsInRange(player, 8.0f, 25.0f, false) ) if (player && me->IsInRange(player, 8.0f, 25.0f, false))
{ {
DoResetThreatList(); DoResetThreatList();
me->AddThreat(player, 5.0f); me->AddThreat(player, 5.0f);
@@ -101,7 +101,7 @@ public:
bool IsEncounterInProgress() const override bool IsEncounterInProgress() const override
{ {
for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) for( uint8 i = 0; i < MAX_ENCOUNTER; ++i )
if( m_auiEncounter[i] == IN_PROGRESS ) if (m_auiEncounter[i] == IN_PROGRESS)
return true; return true;
return false; return false;
@@ -112,54 +112,54 @@ public:
if (TeamIdInInstance == TEAM_NEUTRAL) if (TeamIdInInstance == TEAM_NEUTRAL)
{ {
Map::PlayerList const& players = instance->GetPlayers(); Map::PlayerList const& players = instance->GetPlayers();
if( !players.IsEmpty() ) if (!players.IsEmpty())
if( Player* pPlayer = players.begin()->GetSource() ) if (Player* pPlayer = players.begin()->GetSource())
TeamIdInInstance = pPlayer->GetTeamId(); TeamIdInInstance = pPlayer->GetTeamId();
} }
switch( creature->GetEntry() ) switch (creature->GetEntry())
{ {
// Grand Champions: // Grand Champions:
case NPC_MOKRA: case NPC_MOKRA:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_JACOB); creature->UpdateEntry(NPC_JACOB);
break; break;
case NPC_ERESSEA: case NPC_ERESSEA:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_AMBROSE); creature->UpdateEntry(NPC_AMBROSE);
break; break;
case NPC_RUNOK: case NPC_RUNOK:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_COLOSOS); creature->UpdateEntry(NPC_COLOSOS);
break; break;
case NPC_ZULTORE: case NPC_ZULTORE:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_JAELYNE); creature->UpdateEntry(NPC_JAELYNE);
break; break;
case NPC_VISCERI: case NPC_VISCERI:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_LANA); creature->UpdateEntry(NPC_LANA);
break; break;
// Grand Champion Minions: // Grand Champion Minions:
case NPC_ORGRIMMAR_MINION: case NPC_ORGRIMMAR_MINION:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_STORMWIND_MINION); creature->UpdateEntry(NPC_STORMWIND_MINION);
break; break;
case NPC_SILVERMOON_MINION: case NPC_SILVERMOON_MINION:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_GNOMEREGAN_MINION); creature->UpdateEntry(NPC_GNOMEREGAN_MINION);
break; break;
case NPC_THUNDER_BLUFF_MINION: case NPC_THUNDER_BLUFF_MINION:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_EXODAR_MINION); creature->UpdateEntry(NPC_EXODAR_MINION);
break; break;
case NPC_SENJIN_MINION: case NPC_SENJIN_MINION:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_DARNASSUS_MINION); creature->UpdateEntry(NPC_DARNASSUS_MINION);
break; break;
case NPC_UNDERCITY_MINION: case NPC_UNDERCITY_MINION:
if( TeamIdInInstance == TEAM_HORDE ) if (TeamIdInInstance == TEAM_HORDE)
creature->UpdateEntry(NPC_IRONFORGE_MINION); creature->UpdateEntry(NPC_IRONFORGE_MINION);
break; break;
@@ -173,7 +173,7 @@ public:
case NPC_JAEREN: case NPC_JAEREN:
case NPC_ARELAS: case NPC_ARELAS:
NPC_AnnouncerGUID = creature->GetGUID(); NPC_AnnouncerGUID = creature->GetGUID();
//if( TeamIdInInstance == TEAM_ALLIANCE ) //if (TeamIdInInstance == TEAM_ALLIANCE)
// creature->UpdateEntry(NPC_ARELAS); // creature->UpdateEntry(NPC_ARELAS);
creature->SetReactState(REACT_PASSIVE); creature->SetReactState(REACT_PASSIVE);
break; break;
@@ -186,7 +186,7 @@ public:
// Beginning vehicles: // Beginning vehicles:
case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_WARHORSE:
case VEHICLE_ARGENT_BATTLEWORG: case VEHICLE_ARGENT_BATTLEWORG:
if( InstanceProgress < INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED && m_auiEncounter[0] == NOT_STARTED ) if (InstanceProgress < INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED && m_auiEncounter[0] == NOT_STARTED)
{ {
creature->DespawnOrUnsummon(); creature->DespawnOrUnsummon();
creature->SetRespawnTime(3); creature->SetRespawnTime(3);
@@ -204,7 +204,7 @@ public:
void OnGameObjectCreate(GameObject* go) override void OnGameObjectCreate(GameObject* go) override
{ {
switch( go->GetEntry() ) switch (go->GetEntry())
{ {
case GO_MAIN_GATE: case GO_MAIN_GATE:
GO_MainGateGUID = go->GetGUID(); GO_MainGateGUID = go->GetGUID();
@@ -237,7 +237,7 @@ public:
events.Reset(); events.Reset();
events.RescheduleEvent(EVENT_CHECK_PLAYERS, 0ms); events.RescheduleEvent(EVENT_CHECK_PLAYERS, 0ms);
if( !in ) if (!in)
{ {
OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_FAIL;
return; return;
@@ -250,17 +250,17 @@ public:
std::istringstream loadStream(in); std::istringstream loadStream(in);
loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3;
if( dataHead1 == 'T' && dataHead2 == 'C' ) if (dataHead1 == 'T' && dataHead2 == 'C')
{ {
m_auiEncounter[0] = data0; m_auiEncounter[0] = data0;
m_auiEncounter[1] = data1; m_auiEncounter[1] = data1;
m_auiEncounter[2] = data2; m_auiEncounter[2] = data2;
InstanceProgress = data3; InstanceProgress = data3;
if( InstanceProgress == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) if (InstanceProgress == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED)
InstanceProgress = INSTANCE_PROGRESS_INITIAL; InstanceProgress = INSTANCE_PROGRESS_INITIAL;
for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) for( uint8 i = 0; i < MAX_ENCOUNTER; ++i )
if( m_auiEncounter[i] == IN_PROGRESS ) if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED; m_auiEncounter[i] = NOT_STARTED;
} }
else else
@@ -306,10 +306,10 @@ public:
void InstanceCleanup() void InstanceCleanup()
{ {
if( CLEANED ) if (CLEANED)
return; return;
switch( InstanceProgress ) switch (InstanceProgress)
{ {
case INSTANCE_PROGRESS_INITIAL: case INSTANCE_PROGRESS_INITIAL:
case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST: case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST:
@@ -328,15 +328,15 @@ public:
{ {
for( uint8 j = 0; j < 3; ++j ) for( uint8 j = 0; j < 3; ++j )
{ {
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[i][j]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[i][j]))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
NPC_GrandChampionMinionsGUID[i][j].Clear(); NPC_GrandChampionMinionsGUID[i][j].Clear();
} }
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
NPC_GrandChampionGUID[i].Clear(); NPC_GrandChampionGUID[i].Clear();
} }
if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID))
{ {
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
c->SetHomePosition(748.309f, 619.488f, 411.172f, 4.71239f); c->SetHomePosition(748.309f, 619.488f, 411.172f, 4.71239f);
@@ -349,7 +349,7 @@ public:
break; break;
case INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED: case INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
announcer->DespawnOrUnsummon(); announcer->DespawnOrUnsummon();
announcer->SetHomePosition(735.81f, 661.92f, 412.39f, 4.714f); announcer->SetHomePosition(735.81f, 661.92f, 412.39f, 4.714f);
@@ -358,28 +358,28 @@ public:
announcer->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); announcer->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
uint32 entry = c->GetEntry(); uint32 entry = c->GetEntry();
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
switch( i ) switch (i)
{ {
case 0: case 0:
if( Creature* pBoss = announcer->SummonCreature(entry, 736.695f, 650.02f, 412.4f, 3 * M_PI / 2) ) if (Creature* pBoss = announcer->SummonCreature(entry, 736.695f, 650.02f, 412.4f, 3 * M_PI / 2))
{ {
NPC_GrandChampionGUID[0] = pBoss->GetGUID(); NPC_GrandChampionGUID[0] = pBoss->GetGUID();
pBoss->AI()->SetData(0, 2); pBoss->AI()->SetData(0, 2);
} }
break; break;
case 1: case 1:
if( Creature* pBoss = announcer->SummonCreature(entry, 756.32f, 650.05f, 412.4f, 3 * M_PI / 2) ) if (Creature* pBoss = announcer->SummonCreature(entry, 756.32f, 650.05f, 412.4f, 3 * M_PI / 2))
{ {
NPC_GrandChampionGUID[1] = pBoss->GetGUID(); NPC_GrandChampionGUID[1] = pBoss->GetGUID();
pBoss->AI()->SetData(1, 2); pBoss->AI()->SetData(1, 2);
} }
break; break;
case 2: case 2:
if( Creature* pBoss = announcer->SummonCreature(entry, 746.5f, 650.65f, 411.7f, 3 * M_PI / 2) ) if (Creature* pBoss = announcer->SummonCreature(entry, 746.5f, 650.65f, 411.7f, 3 * M_PI / 2))
{ {
NPC_GrandChampionGUID[2] = pBoss->GetGUID(); NPC_GrandChampionGUID[2] = pBoss->GetGUID();
pBoss->AI()->SetData(2, 2); pBoss->AI()->SetData(2, 2);
@@ -397,17 +397,17 @@ public:
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
for( uint8 j = 0; j < 3; ++j ) for( uint8 j = 0; j < 3; ++j )
{ {
if( Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]) ) if (Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
NPC_ArgentSoldierGUID[i][j].Clear(); NPC_ArgentSoldierGUID[i][j].Clear();
} }
if( Creature* c = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* c = instance->GetCreature(NPC_ArgentChampionGUID))
{ {
c->AI()->DoAction(-1); // paletress despawn memory c->AI()->DoAction(-1); // paletress despawn memory
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
} }
NPC_ArgentChampionGUID.Clear(); NPC_ArgentChampionGUID.Clear();
if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID))
{ {
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f); c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f);
@@ -422,16 +422,16 @@ public:
case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED:
// revert to INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED // revert to INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED
{ {
if( Creature* c = instance->GetCreature(NPC_BlackKnightVehicleGUID) ) if (Creature* c = instance->GetCreature(NPC_BlackKnightVehicleGUID))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
NPC_BlackKnightVehicleGUID.Clear(); NPC_BlackKnightVehicleGUID.Clear();
if( Creature* c = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* c = instance->GetCreature(NPC_BlackKnightGUID))
{ {
c->AI()->DoAction(-1); c->AI()->DoAction(-1);
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
} }
NPC_BlackKnightGUID.Clear(); NPC_BlackKnightGUID.Clear();
if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID))
{ {
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f); c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f);
@@ -443,7 +443,7 @@ public:
} }
break; break;
case INSTANCE_PROGRESS_FINISHED: case INSTANCE_PROGRESS_FINISHED:
if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
break; break;
} }
@@ -460,7 +460,7 @@ public:
uint32 GetData(uint32 uiData) const override uint32 GetData(uint32 uiData) const override
{ {
switch( uiData ) switch (uiData)
{ {
case DATA_INSTANCE_PROGRESS: case DATA_INSTANCE_PROGRESS:
return InstanceProgress; return InstanceProgress;
@@ -473,7 +473,7 @@ public:
ObjectGuid GetGuidData(uint32 uiData) const override ObjectGuid GetGuidData(uint32 uiData) const override
{ {
switch( uiData ) switch (uiData)
{ {
case DATA_ANNOUNCER: case DATA_ANNOUNCER:
return NPC_AnnouncerGUID; return NPC_AnnouncerGUID;
@@ -486,21 +486,21 @@ public:
void SetData(uint32 uiType, uint32 uiData) override void SetData(uint32 uiType, uint32 uiData) override
{ {
switch( uiType ) switch (uiType)
{ {
case DATA_ANNOUNCER_GOSSIP_SELECT: case DATA_ANNOUNCER_GOSSIP_SELECT:
switch( InstanceProgress ) switch (InstanceProgress)
{ {
case INSTANCE_PROGRESS_INITIAL: case INSTANCE_PROGRESS_INITIAL:
if (uiData == 0) // normal intro if (uiData == 0) // normal intro
{ {
shortver = false; shortver = false;
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
if( GameObject* gate = instance->GetGameObject(GO_MainGateGUID) ) if (GameObject* gate = instance->GetGameObject(GO_MainGateGUID))
announcer->SetFacingToObject(gate); announcer->SetFacingToObject(gate);
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_WELCOME); tirion->AI()->Talk(TEXT_WELCOME);
} }
events.RescheduleEvent(EVENT_YELL_WELCOME_2, 8s); events.RescheduleEvent(EVENT_YELL_WELCOME_2, 8s);
@@ -521,7 +521,7 @@ public:
InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST; InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST;
uiData = DONE; // save to db uiData = DONE; // save to db
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
announcer->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); announcer->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
announcer->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); announcer->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f);
@@ -530,10 +530,10 @@ public:
} }
break; break;
case INSTANCE_PROGRESS_CHAMPIONS_DEAD: case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
Counter = urand(0, 1); Counter = urand(0, 1);
if( Counter ) if (Counter)
announcer->AI()->Talk(SAY_EADRIC_INTRO_ANNOUNCER); announcer->AI()->Talk(SAY_EADRIC_INTRO_ANNOUNCER);
else else
announcer->AI()->Talk(SAY_JAEREN_PALETRESS_INTRO); announcer->AI()->Talk(SAY_JAEREN_PALETRESS_INTRO);
@@ -542,7 +542,7 @@ public:
events.RescheduleEvent(EVENT_START_ARGENT_CHALLENGE_INTRO, 0ms); events.RescheduleEvent(EVENT_START_ARGENT_CHALLENGE_INTRO, 0ms);
break; break;
case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED:
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_BK_INTRO); tirion->AI()->Talk(TEXT_BK_INTRO);
events.RescheduleEvent(EVENT_SUMMON_BLACK_KNIGHT, 3s); events.RescheduleEvent(EVENT_SUMMON_BLACK_KNIGHT, 3s);
break; break;
@@ -551,7 +551,7 @@ public:
case DATA_GRAND_CHAMPION_REACHED_DEST: case DATA_GRAND_CHAMPION_REACHED_DEST:
if (shortver) if (shortver)
break; break;
switch( uiData ) switch (uiData)
{ {
case 0: case 0:
events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_2, 0ms); events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_2, 0ms);
@@ -560,7 +560,7 @@ public:
events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_3, 0ms); events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_3, 0ms);
break; break;
case 2: case 2:
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST; InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST;
uiData = DONE; // save to db uiData = DONE; // save to db
@@ -572,10 +572,10 @@ public:
} }
break; break;
case DATA_MOUNT_DIED: case DATA_MOUNT_DIED:
switch( InstanceProgress ) switch (InstanceProgress)
{ {
case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST: // fighting group 1/3 case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST: // fighting group 1/3
if( ++Counter >= 3 ) if (++Counter >= 3)
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1;
@@ -584,7 +584,7 @@ public:
} }
break; break;
case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1: // fighting group 2/3 case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1: // fighting group 2/3
if( ++Counter >= 3 ) if (++Counter >= 3)
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2;
@@ -593,7 +593,7 @@ public:
} }
break; break;
case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2: // fighting group 3/3 case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2: // fighting group 3/3
if( ++Counter >= 3 ) if (++Counter >= 3)
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3;
@@ -602,7 +602,7 @@ public:
} }
break; break;
case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3: // fighting grand champions (on vehicles) case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3: // fighting grand champions (on vehicles)
if( ++Counter >= 3 ) if (++Counter >= 3)
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED; InstanceProgress = INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED;
@@ -618,7 +618,7 @@ public:
--Counter; --Counter;
break; break;
case DATA_GRAND_CHAMPION_DIED: case DATA_GRAND_CHAMPION_DIED:
if( ++Counter >= 3 ) if (++Counter >= 3)
{ {
Counter = 0; Counter = 0;
VehicleList.clear(); VehicleList.clear();
@@ -627,7 +627,7 @@ public:
m_auiEncounter[0] = DONE; m_auiEncounter[0] = DONE;
bool creditCasted = false; bool creditCasted = false;
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
c->GetMotionMaster()->MovePoint(9, 747.36f, 670.07f, 411.9f); c->GetMotionMaster()->MovePoint(9, 747.36f, 670.07f, 411.9f);
if (!creditCasted) if (!creditCasted)
@@ -636,7 +636,7 @@ public:
creditCasted = true; creditCasted = true;
} }
} }
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f); announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f);
announcer->SummonGameObject(instance->IsHeroic() ? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); // [LOOT] announcer->SummonGameObject(instance->IsHeroic() ? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); // [LOOT]
@@ -645,12 +645,12 @@ public:
} }
// bind players to instance // bind players to instance
if( instance->IsHeroic() ) if (instance->IsHeroic())
instance->ToInstanceMap()->PermBindAllPlayers(); instance->ToInstanceMap()->PermBindAllPlayers();
} }
break; break;
case DATA_ARGENT_SOLDIER_DEFEATED: case DATA_ARGENT_SOLDIER_DEFEATED:
if( ++Counter >= 9 ) if (++Counter >= 9)
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_ARGENT_SOLDIERS_DIED; InstanceProgress = INSTANCE_PROGRESS_ARGENT_SOLDIERS_DIED;
@@ -661,7 +661,7 @@ public:
case BOSS_ARGENT_CHALLENGE: case BOSS_ARGENT_CHALLENGE:
{ {
m_auiEncounter[1] = uiData; m_auiEncounter[1] = uiData;
if( uiData == DONE ) if (uiData == DONE)
{ {
HandleGameObject(GO_EnterGateGUID, true); HandleGameObject(GO_EnterGateGUID, true);
InstanceProgress = INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED; InstanceProgress = INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED;
@@ -685,7 +685,7 @@ public:
HandleGameObject(GO_EnterGateGUID, false); HandleGameObject(GO_EnterGateGUID, false);
bAchievIveHadWorse = true; bAchievIveHadWorse = true;
} }
else if( uiData == DONE ) else if (uiData == DONE)
{ {
HandleGameObject(GO_EnterGateGUID, true); HandleGameObject(GO_EnterGateGUID, true);
InstanceProgress = INSTANCE_PROGRESS_FINISHED; InstanceProgress = INSTANCE_PROGRESS_FINISHED;
@@ -698,7 +698,7 @@ public:
break; break;
} }
if( uiData == DONE ) if (uiData == DONE)
SaveToDB(); SaveToDB();
} }
@@ -708,7 +708,7 @@ public:
uint32 MINION_TO_SUMMON = 0; uint32 MINION_TO_SUMMON = 0;
int32 TEXT_ID = 0; int32 TEXT_ID = 0;
switch( BossNumber ) switch (BossNumber)
{ {
case 0: case 0:
CHAMPION_TO_SUMMON = NPC_MOKRA; CHAMPION_TO_SUMMON = NPC_MOKRA;
@@ -754,7 +754,7 @@ public:
break; break;
} }
if( Creature* pBoss = instance->SummonCreature(CHAMPION_TO_SUMMON, SpawnPos) ) if (Creature* pBoss = instance->SummonCreature(CHAMPION_TO_SUMMON, SpawnPos))
{ {
NPC_GrandChampionGUID[BossOrder] = pBoss->GetGUID(); NPC_GrandChampionGUID[BossOrder] = pBoss->GetGUID();
pBoss->ToCreature()->SetReactState(REACT_PASSIVE); pBoss->ToCreature()->SetReactState(REACT_PASSIVE);
@@ -764,7 +764,7 @@ public:
pBoss->AI()->SetData(BossOrder, (shortver ? 1 : 0)); pBoss->AI()->SetData(BossOrder, (shortver ? 1 : 0));
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* pAdd = instance->SummonCreature(MINION_TO_SUMMON, SpawnPos) ) if (Creature* pAdd = instance->SummonCreature(MINION_TO_SUMMON, SpawnPos))
{ {
NPC_GrandChampionMinionsGUID[BossOrder][i] = pAdd->GetGUID(); NPC_GrandChampionMinionsGUID[BossOrder][i] = pAdd->GetGUID();
pAdd->SetReactState(REACT_PASSIVE); pAdd->SetReactState(REACT_PASSIVE);
@@ -776,7 +776,7 @@ public:
} }
if (!shortver) if (!shortver)
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
announcer->AI()->Talk(TEXT_ID); /// @todo: Missing Argent Raid Spectator cheers. announcer->AI()->Talk(TEXT_ID); /// @todo: Missing Argent Raid Spectator cheers.
} }
@@ -785,7 +785,7 @@ public:
void Update(uint32 diff) override void Update(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case EVENT_NULL: case EVENT_NULL:
break; break;
@@ -842,15 +842,15 @@ public:
} }
case EVENT_GRAND_GROUP_1_MOVE_MIDDLE: case EVENT_GRAND_GROUP_1_MOVE_MIDDLE:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
announcer->SetFacingTo(4.714f); announcer->SetFacingTo(4.714f);
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_BEGIN); tirion->AI()->Talk(TEXT_BEGIN);
HandleGameObject(GO_EnterGateGUID, false); HandleGameObject(GO_EnterGateGUID, false);
} }
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]))
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f);
@@ -862,12 +862,12 @@ public:
case EVENT_GRAND_GROUP_1_ATTACK: case EVENT_GRAND_GROUP_1_ATTACK:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
if( Unit* target = c->SelectNearestTarget(200.0f) ) if (Unit* target = c->SelectNearestTarget(200.0f))
c->AI()->AttackStart(target); c->AI()->AttackStart(target);
c->AI()->DoZoneInCombat(); c->AI()->DoZoneInCombat();
} }
@@ -877,7 +877,7 @@ public:
case EVENT_GRAND_GROUP_2_MOVE_MIDDLE: case EVENT_GRAND_GROUP_2_MOVE_MIDDLE:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]))
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f);
@@ -889,12 +889,12 @@ public:
case EVENT_GRAND_GROUP_2_ATTACK: case EVENT_GRAND_GROUP_2_ATTACK:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
if( Unit* target = c->SelectNearestTarget(200.0f) ) if (Unit* target = c->SelectNearestTarget(200.0f))
c->AI()->AttackStart(target); c->AI()->AttackStart(target);
c->AI()->DoZoneInCombat(); c->AI()->DoZoneInCombat();
} }
@@ -903,7 +903,7 @@ public:
case EVENT_GRAND_GROUP_3_MOVE_MIDDLE: case EVENT_GRAND_GROUP_3_MOVE_MIDDLE:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]))
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f);
@@ -915,12 +915,12 @@ public:
case EVENT_GRAND_GROUP_3_ATTACK: case EVENT_GRAND_GROUP_3_ATTACK:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
if( Unit* target = c->SelectNearestTarget(200.0f) ) if (Unit* target = c->SelectNearestTarget(200.0f))
c->AI()->AttackStart(target); c->AI()->AttackStart(target);
c->AI()->DoZoneInCombat(); c->AI()->DoZoneInCombat();
} }
@@ -929,7 +929,7 @@ public:
case EVENT_GRAND_CHAMPIONS_MOVE_MIDDLE: case EVENT_GRAND_CHAMPIONS_MOVE_MIDDLE:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
c->GetMotionMaster()->MovePoint(4, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); c->GetMotionMaster()->MovePoint(4, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f);
@@ -941,12 +941,12 @@ public:
case EVENT_GRAND_CHAMPIONS_MOUNTS_ATTACK: case EVENT_GRAND_CHAMPIONS_MOUNTS_ATTACK:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
if( Unit* target = c->SelectNearestTarget(200.0f) ) if (Unit* target = c->SelectNearestTarget(200.0f))
c->AI()->AttackStart(target); c->AI()->AttackStart(target);
c->AI()->DoZoneInCombat(); c->AI()->DoZoneInCombat();
c->CastSpell(c, 67865, true); // SPELL_TRAMPLE_AURA c->CastSpell(c, 67865, true); // SPELL_TRAMPLE_AURA
@@ -956,10 +956,10 @@ public:
case EVENT_GRAND_CHAMPIONS_MOVE_SIDE: case EVENT_GRAND_CHAMPIONS_MOVE_SIDE:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
c->AI()->DoAction(1); c->AI()->DoAction(1);
switch( i ) switch (i)
{ {
case 0: case 0:
c->GetMotionMaster()->MovePoint(5, 736.695f, 650.02f, 412.4f); c->GetMotionMaster()->MovePoint(5, 736.695f, 650.02f, 412.4f);
@@ -979,12 +979,12 @@ public:
case EVENT_GRAND_CHAMPIONS_ATTACK: case EVENT_GRAND_CHAMPIONS_ATTACK:
{ {
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
if( Unit* target = c->SelectNearestTarget(200.0f) ) if (Unit* target = c->SelectNearestTarget(200.0f))
c->AI()->AttackStart(target); c->AI()->AttackStart(target);
c->AI()->DoZoneInCombat(); c->AI()->DoZoneInCombat();
c->AI()->DoAction(2); c->AI()->DoAction(2);
@@ -993,7 +993,7 @@ public:
break; break;
case EVENT_GRATZ_SLAIN_CHAMPIONS: case EVENT_GRATZ_SLAIN_CHAMPIONS:
{ {
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_GRATZ_SLAIN_CHAMPIONS); tirion->AI()->Talk(TEXT_GRATZ_SLAIN_CHAMPIONS);
HandleGameObject(GO_EnterGateGUID, true); HandleGameObject(GO_EnterGateGUID, true);
@@ -1001,15 +1001,15 @@ public:
break; break;
case EVENT_RESTORE_ANNOUNCER_GOSSIP: case EVENT_RESTORE_ANNOUNCER_GOSSIP:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
announcer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); announcer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
} }
break; break;
case EVENT_START_ARGENT_CHALLENGE_INTRO: case EVENT_START_ARGENT_CHALLENGE_INTRO:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
if( GameObject* gate = instance->GetGameObject(GO_MainGateGUID) ) if (GameObject* gate = instance->GetGameObject(GO_MainGateGUID))
{ {
announcer->SetFacingToObject(gate); announcer->SetFacingToObject(gate);
HandleGameObject(GO_MainGateGUID, true, gate); HandleGameObject(GO_MainGateGUID, true, gate);
@@ -1023,19 +1023,19 @@ public:
float x = pos.GetPositionX(); float x = pos.GetPositionX();
pos.m_positionX = x - 2.0f + (i - 1) * 10.0f; pos.m_positionX = x - 2.0f + (i - 1) * 10.0f;
if( Creature* pTrash = instance->SummonCreature(NPC_ARGENT_LIGHTWIELDER, pos) ) if (Creature* pTrash = instance->SummonCreature(NPC_ARGENT_LIGHTWIELDER, pos))
{ {
pTrash->AI()->SetData(i, 0); pTrash->AI()->SetData(i, 0);
NPC_ArgentSoldierGUID[i][0] = pTrash->GetGUID(); NPC_ArgentSoldierGUID[i][0] = pTrash->GetGUID();
} }
pos.m_positionX = x + (i - 1) * 10.0f; pos.m_positionX = x + (i - 1) * 10.0f;
if( Creature* pTrash = instance->SummonCreature(NPC_ARGENT_MONK, pos) ) if (Creature* pTrash = instance->SummonCreature(NPC_ARGENT_MONK, pos))
{ {
pTrash->AI()->SetData(i, 0); pTrash->AI()->SetData(i, 0);
NPC_ArgentSoldierGUID[i][1] = pTrash->GetGUID(); NPC_ArgentSoldierGUID[i][1] = pTrash->GetGUID();
} }
pos.m_positionX = x + 2.0f + (i - 1) * 10.0f; pos.m_positionX = x + 2.0f + (i - 1) * 10.0f;
if( Creature* pTrash = instance->SummonCreature(NPC_PRIESTESS, pos) ) if (Creature* pTrash = instance->SummonCreature(NPC_PRIESTESS, pos))
{ {
pTrash->AI()->SetData(i, 0); pTrash->AI()->SetData(i, 0);
NPC_ArgentSoldierGUID[i][2] = pTrash->GetGUID(); NPC_ArgentSoldierGUID[i][2] = pTrash->GetGUID();
@@ -1046,7 +1046,7 @@ public:
break; break;
case EVENT_SUMMON_ARGENT_CHALLENGE: case EVENT_SUMMON_ARGENT_CHALLENGE:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
announcer->GetMotionMaster()->MovePoint(0, 735.81f, 661.92f, 412.39f); announcer->GetMotionMaster()->MovePoint(0, 735.81f, 661.92f, 412.39f);
if (Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition)) if (Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition))
boss->GetMotionMaster()->MovePoint(0, 746.881f, 660.263f, 411.7f); boss->GetMotionMaster()->MovePoint(0, 746.881f, 660.263f, 411.7f);
@@ -1057,15 +1057,15 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_SAY_1: case EVENT_ARGENT_CHALLENGE_SAY_1:
{ {
if( Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID))
ac->AI()->Talk(Counter ? SAY_EADRIC_INTRO : SAY_PALETRESS_INTRO_1); ac->AI()->Talk(Counter ? SAY_EADRIC_INTRO : SAY_PALETRESS_INTRO_1);
if( !Counter ) if (!Counter)
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_SAY_2, 6s); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_SAY_2, 6s);
} }
break; break;
case EVENT_ARGENT_CHALLENGE_SAY_2: case EVENT_ARGENT_CHALLENGE_SAY_2:
{ {
if( Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID))
ac->AI()->Talk(SAY_PALETRESS_INTRO_2); ac->AI()->Talk(SAY_PALETRESS_INTRO_2);
} }
break; break;
@@ -1074,14 +1074,14 @@ public:
Counter = 0; Counter = 0;
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
for( uint8 j = 0; j < 3; ++j ) for( uint8 j = 0; j < 3; ++j )
if( Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]) ) if (Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
c->SetImmuneToAll(false); c->SetImmuneToAll(false);
//c->AI()->DoZoneInCombat(); //c->AI()->DoZoneInCombat();
} }
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_YOU_MAY_BEGIN); tirion->AI()->Talk(TEXT_YOU_MAY_BEGIN);
} }
break; break;
@@ -1096,12 +1096,12 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_ATTACK: case EVENT_ARGENT_CHALLENGE_ATTACK:
{ {
if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
{ {
boss->SetReactState(REACT_AGGRESSIVE); boss->SetReactState(REACT_AGGRESSIVE);
boss->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); boss->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
boss->SetImmuneToAll(false); boss->SetImmuneToAll(false);
if( Unit* target = boss->SelectNearestTarget(200.0f) ) if (Unit* target = boss->SelectNearestTarget(200.0f))
boss->AI()->AttackStart(target); boss->AI()->AttackStart(target);
boss->AI()->DoZoneInCombat(); boss->AI()->DoZoneInCombat();
} }
@@ -1109,7 +1109,7 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_RUN_MIDDLE: case EVENT_ARGENT_CHALLENGE_RUN_MIDDLE:
{ {
if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
{ {
boss->GetMotionMaster()->MovePoint(1, 747.13f, 628.037f, 411.2f); boss->GetMotionMaster()->MovePoint(1, 747.13f, 628.037f, 411.2f);
events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_LEAVE_CHEST, 6s); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_LEAVE_CHEST, 6s);
@@ -1118,12 +1118,12 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_LEAVE_CHEST: case EVENT_ARGENT_CHALLENGE_LEAVE_CHEST:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
{ {
announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f); announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f);
uint32 chest = 0; uint32 chest = 0;
if( instance->IsHeroic() ) if (instance->IsHeroic())
chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT_H : GO_PALETRESS_LOOT_H; chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT_H : GO_PALETRESS_LOOT_H;
else else
chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT : GO_PALETRESS_LOOT; chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT : GO_PALETRESS_LOOT;
@@ -1136,7 +1136,7 @@ public:
break; break;
case EVENT_ARGENT_CHALLENGE_DISAPPEAR: case EVENT_ARGENT_CHALLENGE_DISAPPEAR:
{ {
if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID))
{ {
boss->GetMotionMaster()->MovePoint(0, SpawnPosition); boss->GetMotionMaster()->MovePoint(0, SpawnPosition);
boss->DespawnOrUnsummon(3000); boss->DespawnOrUnsummon(3000);
@@ -1145,18 +1145,18 @@ public:
break; break;
case EVENT_SUMMON_BLACK_KNIGHT: case EVENT_SUMMON_BLACK_KNIGHT:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
if( Creature* bk_vehicle = announcer->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0.0f) ) if (Creature* bk_vehicle = announcer->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0.0f))
{ {
NPC_BlackKnightVehicleGUID = bk_vehicle->GetGUID(); NPC_BlackKnightVehicleGUID = bk_vehicle->GetGUID();
bk_vehicle->SetReactState(REACT_PASSIVE); bk_vehicle->SetReactState(REACT_PASSIVE);
bk_vehicle->SetFacingTo(M_PI); bk_vehicle->SetFacingTo(M_PI);
if( Vehicle* v = bk_vehicle->GetVehicleKit() ) if (Vehicle* v = bk_vehicle->GetVehicleKit())
if( Unit* bk = v->GetPassenger(0) ) if (Unit* bk = v->GetPassenger(0))
{ {
NPC_BlackKnightGUID = bk->GetGUID(); NPC_BlackKnightGUID = bk->GetGUID();
bk->SendMovementFlagUpdate(); // put him on vehicle visually bk->SendMovementFlagUpdate(); // put him on vehicle visually
if( bk->IsCreature() ) if (bk->IsCreature())
bk->ToCreature()->SetReactState(REACT_PASSIVE); bk->ToCreature()->SetReactState(REACT_PASSIVE);
} }
@@ -1167,7 +1167,7 @@ public:
break; break;
case EVENT_START_BLACK_KNIGHT_SCENE: case EVENT_START_BLACK_KNIGHT_SCENE:
{ {
if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID))
{ {
Position exitPos = { 751.003357f, 638.145508f, 411.570129f, M_PI }; Position exitPos = { 751.003357f, 638.145508f, 411.570129f, M_PI };
bk->ExitVehicle(/*&exitPos*/); bk->ExitVehicle(/*&exitPos*/);
@@ -1179,9 +1179,9 @@ public:
break; break;
case EVENT_BLACK_KNIGHT_CAST_ANNOUNCER: case EVENT_BLACK_KNIGHT_CAST_ANNOUNCER:
{ {
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
{ {
if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID))
{ {
bk->SetPosition(745.016f, 631.506f, 411.575f, bk->GetAngle(announcer)); bk->SetPosition(745.016f, 631.506f, 411.575f, bk->GetAngle(announcer));
bk->SetHomePosition(*bk); bk->SetHomePosition(*bk);
@@ -1189,7 +1189,7 @@ public:
announcer->SetFacingToObject(bk); announcer->SetFacingToObject(bk);
announcer->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); announcer->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
bk->AddAura(68306, announcer); // spell has attribute player only bk->AddAura(68306, announcer); // spell has attribute player only
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) if (Creature* tirion = instance->GetCreature(NPC_TirionGUID))
tirion->AI()->Talk(TEXT_BK_MEANING); tirion->AI()->Talk(TEXT_BK_MEANING);
} }
} }
@@ -1198,7 +1198,7 @@ public:
break; break;
case EVENT_BLACK_KNIGHT_KILL_ANNOUNCER: case EVENT_BLACK_KNIGHT_KILL_ANNOUNCER:
{ {
if( Creature* bk_vehicle = instance->GetCreature(NPC_BlackKnightVehicleGUID) ) if (Creature* bk_vehicle = instance->GetCreature(NPC_BlackKnightVehicleGUID))
bk_vehicle->AI()->DoAction(1); bk_vehicle->AI()->DoAction(1);
events.ScheduleEvent(EVENT_BLACK_KNIGHT_MOVE_FORWARD, 4s); events.ScheduleEvent(EVENT_BLACK_KNIGHT_MOVE_FORWARD, 4s);
@@ -1206,13 +1206,13 @@ public:
break; break;
case EVENT_BLACK_KNIGHT_MOVE_FORWARD: case EVENT_BLACK_KNIGHT_MOVE_FORWARD:
{ {
if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID))
{ {
bk->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); bk->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
bk->GetMotionMaster()->MovePoint(0, 746.81f, 623.15f, 411.42f); bk->GetMotionMaster()->MovePoint(0, 746.81f, 623.15f, 411.42f);
bk->AI()->Talk(SAY_BK_INTRO_2); bk->AI()->Talk(SAY_BK_INTRO_2);
} }
if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID))
if (announcer->IsAlive()) if (announcer->IsAlive())
Unit::Kill(announcer, announcer); Unit::Kill(announcer, announcer);
events.ScheduleEvent(EVENT_BLACK_KNIGHT_SAY_TASK, 14s); events.ScheduleEvent(EVENT_BLACK_KNIGHT_SAY_TASK, 14s);
@@ -1220,7 +1220,7 @@ public:
break; break;
case EVENT_BLACK_KNIGHT_SAY_TASK: case EVENT_BLACK_KNIGHT_SAY_TASK:
{ {
if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID))
{ {
bk->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); bk->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
bk->AI()->Talk(SAY_BK_INTRO_3); bk->AI()->Talk(SAY_BK_INTRO_3);
@@ -1230,11 +1230,11 @@ public:
break; break;
case EVENT_BLACK_KNIGHT_ATTACK: case EVENT_BLACK_KNIGHT_ATTACK:
{ {
if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID))
{ {
bk->SetReactState(REACT_AGGRESSIVE); bk->SetReactState(REACT_AGGRESSIVE);
bk->ReplaceAllUnitFlags(UNIT_FLAG_NONE); bk->ReplaceAllUnitFlags(UNIT_FLAG_NONE);
if( Unit* target = bk->SelectNearestTarget(200.0f) ) if (Unit* target = bk->SelectNearestTarget(200.0f))
bk->AI()->AttackStart(target); bk->AI()->AttackStart(target);
bk->AI()->DoZoneInCombat(); bk->AI()->DoZoneInCombat();
bk->AI()->DoAction(1); bk->AI()->DoAction(1);
@@ -1246,7 +1246,7 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case 11789: // I've Had Worse criteria id case 11789: // I've Had Worse criteria id
return bAchievIveHadWorse; return bAchievIveHadWorse;
@@ -88,14 +88,14 @@ public:
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override
{ {
if(!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP))
return true; return true;
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if(!pInstance) if (!pInstance)
return true; return true;
if(uiAction == GOSSIP_ACTION_INFO_DEF + 1 || uiAction == GOSSIP_ACTION_INFO_DEF + 2 || uiAction == GOSSIP_ACTION_INFO_DEF + 3 || uiAction == GOSSIP_ACTION_INFO_DEF + 4) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 || uiAction == GOSSIP_ACTION_INFO_DEF + 2 || uiAction == GOSSIP_ACTION_INFO_DEF + 3 || uiAction == GOSSIP_ACTION_INFO_DEF + 4)
{ {
pInstance->SetData(DATA_ANNOUNCER_GOSSIP_SELECT, (uiAction == GOSSIP_ACTION_INFO_DEF + 2 ? 1 : 0)); pInstance->SetData(DATA_ANNOUNCER_GOSSIP_SELECT, (uiAction == GOSSIP_ACTION_INFO_DEF + 2 ? 1 : 0));
creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
@@ -117,9 +117,9 @@ public:
void Reset() override void Reset() override
{ {
InstanceScript* pInstance = me->GetInstanceScript(); InstanceScript* pInstance = me->GetInstanceScript();
if( !pInstance ) if (!pInstance)
return; return;
if( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE ) if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE )
me->UpdateEntry(NPC_ARELAS); me->UpdateEntry(NPC_ARELAS);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); // removed during black knight scene me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); // removed during black knight scene
} }
@@ -135,7 +135,7 @@ public:
if (type != EFFECT_MOTION_TYPE) if (type != EFFECT_MOTION_TYPE)
return; return;
InstanceScript* pInstance = me->GetInstanceScript(); InstanceScript* pInstance = me->GetInstanceScript();
if( !pInstance ) if (!pInstance)
return; return;
if (pInstance->GetData(DATA_INSTANCE_PROGRESS) < INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED) if (pInstance->GetData(DATA_INSTANCE_PROGRESS) < INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED)
return; return;
@@ -182,7 +182,7 @@ public:
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
float dist = rand_norm() * 40.0f; float dist = rand_norm() * 40.0f;
if( Creature* c = me->SummonCreature(NPC_SCARAB, AnubLocs[0].GetPositionX() + cos(angle) * dist, AnubLocs[0].GetPositionY() + std::sin(angle) * dist, AnubLocs[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000) ) if (Creature* c = me->SummonCreature(NPC_SCARAB, AnubLocs[0].GetPositionX() + cos(angle) * dist, AnubLocs[0].GetPositionY() + std::sin(angle) * dist, AnubLocs[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000))
{ {
c->SetFaction(FACTION_PREY); c->SetFaction(FACTION_PREY);
c->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -193,7 +193,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
switch( param ) switch (param)
{ {
case -1: case -1:
summons.DespawnAll(); summons.DespawnAll();
@@ -210,7 +210,7 @@ public:
events.RescheduleEvent(EVENT_SPELL_PENETRATING_COLD, 15s, 20s); events.RescheduleEvent(EVENT_SPELL_PENETRATING_COLD, 15s, 20s);
events.RescheduleEvent(EVENT_SUMMON_NERUBIAN, 5s, 8s); events.RescheduleEvent(EVENT_SUMMON_NERUBIAN, 5s, 8s);
events.RescheduleEvent(EVENT_SUBMERGE, 80s); events.RescheduleEvent(EVENT_SUBMERGE, 80s);
if( !IsHeroic() ) if (!IsHeroic())
events.RescheduleEvent(EVENT_RESPAWN_SPHERE, 4s); events.RescheduleEvent(EVENT_RESPAWN_SPHERE, 4s);
for (ObjectGuid const& guid : summons) for (ObjectGuid const& guid : summons)
@@ -224,15 +224,15 @@ public:
} }
summons.clear(); summons.clear();
for( uint8 i = 0; i < 4; ++i ) for( uint8 i = 0; i < 4; ++i )
if( Creature* c = me->SummonCreature(NPC_BURROW, AnubLocs[i + 1]) ) if (Creature* c = me->SummonCreature(NPC_BURROW, AnubLocs[i + 1]))
BurrowGUID[i] = c->GetGUID(); BurrowGUID[i] = c->GetGUID();
for( uint8 i = 0; i < 6; ++i ) for( uint8 i = 0; i < 6; ++i )
if( Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]) ) if (Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]))
SphereGUID[i] = c->GetGUID(); SphereGUID[i] = c->GetGUID();
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
DoZoneInCombat(); DoZoneInCombat();
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS); pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS);
} }
@@ -243,21 +243,21 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
if( !bPhase3 && HealthBelowPct(30) && !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) && !me->HasAura(SPELL_SUBMERGE) && !me->HasAura(SPELL_EMERGE) ) if (!bPhase3 && HealthBelowPct(30) && !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) && !me->HasAura(SPELL_SUBMERGE) && !me->HasAura(SPELL_EMERGE))
{ {
bPhase3 = true; bPhase3 = true;
events.CancelEvent(EVENT_SUBMERGE); events.CancelEvent(EVENT_SUBMERGE);
events.CancelEvent(EVENT_EMERGE); events.CancelEvent(EVENT_EMERGE);
events.CancelEvent(EVENT_EMERGE_2); events.CancelEvent(EVENT_EMERGE_2);
if( !IsHeroic() ) if (!IsHeroic())
events.CancelEvent(EVENT_SUMMON_NERUBIAN); events.CancelEvent(EVENT_SUMMON_NERUBIAN);
me->CastSpell((Unit*)nullptr, SPELL_LEECHING_SWARM, false); me->CastSpell((Unit*)nullptr, SPELL_LEECHING_SWARM, false);
Talk(EMOTE_LEECHING_SWARM); Talk(EMOTE_LEECHING_SWARM);
@@ -265,7 +265,7 @@ public:
return; return;
} }
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -280,10 +280,10 @@ public:
uint8 i = StartAt; uint8 i = StartAt;
do do
{ {
if( Creature* c = ObjectAccessor::GetCreature(*me, SphereGUID[i]) ) if (Creature* c = ObjectAccessor::GetCreature(*me, SphereGUID[i]))
if( !c->HasAura(SPELL_FROST_SPHERE) ) if (!c->HasAura(SPELL_FROST_SPHERE))
{ {
if( Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]) ) if (Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]))
SphereGUID[i] = c->GetGUID(); SphereGUID[i] = c->GetGUID();
break; break;
} }
@@ -294,7 +294,7 @@ public:
break; break;
case EVENT_SPELL_FREEZING_SLASH: case EVENT_SPELL_FREEZING_SLASH:
{ {
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_FREEZING_SLASH, false); me->CastSpell(me->GetVictim(), SPELL_FREEZING_SLASH, false);
events.Repeat(15s, 20s); events.Repeat(15s, 20s);
} }
@@ -332,7 +332,7 @@ public:
case EVENT_SUMMON_SCARAB: case EVENT_SUMMON_SCARAB:
{ {
uint8 i = urand(0, 3); uint8 i = urand(0, 3);
if( Creature* c = ObjectAccessor::GetCreature(*me, BurrowGUID[i]) ) if (Creature* c = ObjectAccessor::GetCreature(*me, BurrowGUID[i]))
me->CastSpell(c, SPELL_SUMMON_SCARAB, true); me->CastSpell(c, SPELL_SUMMON_SCARAB, true);
events.Repeat(4s); events.Repeat(4s);
} }
@@ -368,7 +368,7 @@ public:
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) override
{ {
if( !summon ) if (!summon)
return; return;
summons.Summon(summon); summons.Summon(summon);
@@ -379,13 +379,13 @@ public:
events.Reset(); events.Reset();
summons.DespawnAll(); summons.DespawnAll();
Talk(SAY_DEATH); Talk(SAY_DEATH);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_ANUBARAK, DONE); pInstance->SetData(TYPE_ANUBARAK, DONE);
} }
void KilledUnit(Unit* who) override void KilledUnit(Unit* who) override
{ {
if( who->IsPlayer() ) if (who->IsPlayer())
Talk(SAY_KILL_PLAYER); Talk(SAY_KILL_PLAYER);
} }
@@ -394,7 +394,7 @@ public:
events.Reset(); events.Reset();
summons.DespawnAll(); summons.DespawnAll();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 1); pInstance->SetData(TYPE_FAILED, 1);
} }
@@ -409,7 +409,7 @@ public:
if (!bIntro) if (!bIntro)
{ {
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( !me->IsInCombat() ) if (!me->IsInCombat())
Talk(SAY_INTRO); Talk(SAY_INTRO);
bIntro = true; bIntro = true;
} }
@@ -442,7 +442,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == 1 ) if (param == 1)
despawnTimer = 2000; despawnTimer = 2000;
} }
@@ -453,11 +453,11 @@ public:
determinationTimer = urand(10000, 50000); determinationTimer = urand(10000, 50000);
despawnTimer = 0; despawnTimer = 0;
if (me->GetFaction() == FACTION_MONSTER_2) // hostile - it's phase 2 if (me->GetFaction() == FACTION_MONSTER_2) // hostile - it's phase 2
if( Unit* target = me->SelectNearestTarget(250.0f) ) if (Unit* target = me->SelectNearestTarget(250.0f))
{ {
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) if (Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true))
{ {
me->AddThreat(t, 20000.0f); me->AddThreat(t, 20000.0f);
AttackStart(t); AttackStart(t);
@@ -472,9 +472,9 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( despawnTimer ) if (despawnTimer)
{ {
if( despawnTimer <= (int32)diff ) if (despawnTimer <= (int32)diff )
{ {
despawnTimer = 0; despawnTimer = 0;
me->DisappearAndDie(); me->DisappearAndDie();
@@ -485,10 +485,10 @@ public:
return; return;
} }
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
if( determinationTimer <= (int32)diff ) if (determinationTimer <= (int32)diff )
{ {
me->CastSpell(me, SPELL_DETERMINATION, false); me->CastSpell(me, SPELL_DETERMINATION, false);
determinationTimer = urand(20000, 60000); determinationTimer = urand(20000, 60000);
@@ -556,10 +556,10 @@ public:
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if( me->GetHealth() <= damage ) if (me->GetHealth() <= damage )
{ {
damage = 0; damage = 0;
if( !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) ) if (!me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE))
{ {
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
@@ -571,7 +571,7 @@ public:
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{ {
if( spell->Id == SPELL_SPIKE_FAIL ) if (spell->Id == SPELL_SPIKE_FAIL)
{ {
me->RemoveAllAuras(); me->RemoveAllAuras();
me->DespawnOrUnsummon(1500); me->DespawnOrUnsummon(1500);
@@ -580,9 +580,9 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( permafrostTimer ) if (permafrostTimer)
{ {
if( permafrostTimer <= diff ) if (permafrostTimer <= diff)
{ {
permafrostTimer = 0; permafrostTimer = 0;
me->RemoveAurasDueToSpell(SPELL_FROST_SPHERE); me->RemoveAurasDueToSpell(SPELL_FROST_SPHERE);
@@ -631,9 +631,9 @@ public:
me->CastSpell(me, SPELL_SPIDER_FRENZY, true); me->CastSpell(me, SPELL_SPIDER_FRENZY, true);
events.Reset(); events.Reset();
events.RescheduleEvent(EVENT_SUBMERGE, 30s); events.RescheduleEvent(EVENT_SUBMERGE, 30s);
if( IsHeroic() ) if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_SHADOW_STRIKE, 30s, 45s); events.RescheduleEvent(EVENT_SPELL_SHADOW_STRIKE, 30s, 45s);
if( Unit* target = me->SelectNearestTarget(250.0f) ) if (Unit* target = me->SelectNearestTarget(250.0f))
{ {
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
@@ -642,13 +642,13 @@ public:
void SpellHitTarget(Unit* target, SpellInfo const* spell) override void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{ {
if( !target || !spell ) if (!target || !spell)
return; return;
if( spell->Id == SPELL_SHADOW_STRIKE ) if (spell->Id == SPELL_SHADOW_STRIKE)
{ {
float o = target->GetOrientation(); float o = target->GetOrientation();
if( o >= M_PI ) if (o >= M_PI)
o -= M_PI; o -= M_PI;
else else
o += M_PI; o += M_PI;
@@ -661,25 +661,25 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_SHADOW_STRIKE: case EVENT_SPELL_SHADOW_STRIKE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true))
me->CastSpell(target, SPELL_SHADOW_STRIKE, false); me->CastSpell(target, SPELL_SHADOW_STRIKE, false);
events.Repeat(30s, 45s); events.Repeat(30s, 45s);
break; break;
case EVENT_SUBMERGE: case EVENT_SUBMERGE:
if( HealthBelowPct(80) && !me->HasAura(RAID_MODE(66193, 67855, 67856, 67857)) ) // not having permafrost - allow submerge if (HealthBelowPct(80) && !me->HasAura(RAID_MODE(66193, 67855, 67856, 67857))) // not having permafrost - allow submerge
{ {
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
@@ -743,9 +743,9 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == -1 ) if (param == -1)
{ {
if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID))
target->RemoveAura(SPELL_MARK); target->RemoveAura(SPELL_MARK);
TargetGUID.Clear(); TargetGUID.Clear();
me->RemoveAllAuras(); me->RemoveAllAuras();
@@ -758,7 +758,7 @@ public:
void SelectNewTarget(bool next) void SelectNewTarget(bool next)
{ {
if (TargetGUID) if (TargetGUID)
if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID))
target->RemoveAura(SPELL_MARK); target->RemoveAura(SPELL_MARK);
TargetGUID.Clear(); TargetGUID.Clear();
if (!next) if (!next)
@@ -768,7 +768,7 @@ public:
} }
DoZoneInCombat(); DoZoneInCombat();
DoResetThreatList(); DoResetThreatList();
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true))
{ {
if (!next) if (!next)
{ {
@@ -791,10 +791,10 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( TargetGUID ) if (TargetGUID)
{ {
Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID); Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID);
if( !target || !target->HasAura(SPELL_MARK) || !me->IsValidAttackTarget(target) || me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE || !me->HasUnitState(UNIT_STATE_CHASE_MOVE) ) if (!target || !target->HasAura(SPELL_MARK) || !me->IsValidAttackTarget(target) || me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE || !me->HasUnitState(UNIT_STATE_CHASE_MOVE))
{ {
SelectNewTarget(true); SelectNewTarget(true);
return; return;
@@ -803,7 +803,7 @@ public:
events.Update(diff); events.Update(diff);
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -840,13 +840,13 @@ public:
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{ {
if( Unit* target = GetTarget() ) if (Unit* target = GetTarget())
{ {
if( Creature* c = target->FindNearestCreature(NPC_FROST_SPHERE, 8.0f, true) ) if (Creature* c = target->FindNearestCreature(NPC_FROST_SPHERE, 8.0f, true))
{ {
target->UpdatePosition(*c, false); target->UpdatePosition(*c, false);
target->CastCustomSpell(SPELL_SPIKE_FAIL, SPELLVALUE_MAX_TARGETS, 1); target->CastCustomSpell(SPELL_SPIKE_FAIL, SPELLVALUE_MAX_TARGETS, 1);
if( target->IsCreature() ) if (target->IsCreature())
target->ToCreature()->AI()->DoAction(-1); target->ToCreature()->AI()->DoAction(-1);
Remove(); Remove();
return; return;
@@ -116,7 +116,7 @@ public:
void Reset() override void Reset() override
{ {
events.Reset(); events.Reset();
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED); pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED);
std::list<Creature*> creatures; std::list<Creature*> creatures;
@@ -135,34 +135,34 @@ public:
events.RescheduleEvent(EVENT_SPELL_INCINERATE_FLESH, 24s, 26s); events.RescheduleEvent(EVENT_SPELL_INCINERATE_FLESH, 24s, 26s);
events.RescheduleEvent(EVENT_SPELL_NETHER_POWER, 25s, 45s); events.RescheduleEvent(EVENT_SPELL_NETHER_POWER, 25s, 45s);
events.RescheduleEvent(EVENT_SPELL_LEGION_FLAME, 30s); events.RescheduleEvent(EVENT_SPELL_LEGION_FLAME, 30s);
//if( GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC ) //if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC )
// events.RescheduleEvent(EVENT_SPELL_TOUCH_OF_JARAXXUS, 10s, 15s); // events.RescheduleEvent(EVENT_SPELL_TOUCH_OF_JARAXXUS, 10s, 15s);
events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 20s); // it schedules EVENT_SUMMON_VOLCANO events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 20s); // it schedules EVENT_SUMMON_VOLCANO
me->RemoveAura(SPELL_CHAINS); me->RemoveAura(SPELL_CHAINS);
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
DoZoneInCombat(); DoZoneInCombat();
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS); pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS);
} }
void SpellHit(Unit* caster, SpellInfo const* spell) override void SpellHit(Unit* caster, SpellInfo const* spell) override
{ {
switch( spell->Id ) switch (spell->Id)
{ {
case 66228: case 66228:
case 67106: case 67106:
case 67107: case 67107:
case 67108: case 67108:
if( Aura* a = me->GetAura(spell->Id) ) if (Aura* a = me->GetAura(spell->Id))
a->SetStackAmount(spell->StackAmount); a->SetStackAmount(spell->StackAmount);
break; break;
case 30449: case 30449:
{ {
if( !caster ) if (!caster)
return; return;
uint32 id = 0; uint32 id = 0;
switch( me->GetMap()->GetDifficulty() ) switch (me->GetMap()->GetDifficulty())
{ {
case 0: case 0:
id = 66228; id = 66228;
@@ -177,9 +177,9 @@ public:
id = 67108; id = 67108;
break; break;
} }
if( Aura* a = me->GetAura(id) ) if (Aura* a = me->GetAura(id))
{ {
if( a->GetStackAmount() > 1 ) if (a->GetStackAmount() > 1 )
a->ModStackAmount(-1); a->ModStackAmount(-1);
else else
a->Remove(); a->Remove();
@@ -194,30 +194,30 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_FEL_FIREBALL: case EVENT_SPELL_FEL_FIREBALL:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_FEL_FIREBALL, false); me->CastSpell(me->GetVictim(), SPELL_FEL_FIREBALL, false);
events.Repeat(10s, 15s); events.Repeat(10s, 15s);
break; break;
case EVENT_SPELL_FEL_LIGHTNING: case EVENT_SPELL_FEL_LIGHTNING:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true))
me->CastSpell(target, SPELL_FEL_LIGHTNING, false); me->CastSpell(target, SPELL_FEL_LIGHTNING, false);
events.Repeat(10s, 15s); events.Repeat(10s, 15s);
break; break;
case EVENT_SPELL_INCINERATE_FLESH: case EVENT_SPELL_INCINERATE_FLESH:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true))
{ {
Talk(EMOTE_INCINERATE, target); Talk(EMOTE_INCINERATE, target);
Talk(SAY_INCINERATE); Talk(SAY_INCINERATE);
@@ -231,7 +231,7 @@ public:
events.Repeat(25s, 45s); events.Repeat(25s, 45s);
break; break;
case EVENT_SPELL_LEGION_FLAME: case EVENT_SPELL_LEGION_FLAME:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true))
{ {
Talk(EMOTE_LEGION_FLAME, target); Talk(EMOTE_LEGION_FLAME, target);
me->CastSpell(target, SPELL_LEGION_FLAME, false); me->CastSpell(target, SPELL_LEGION_FLAME, false);
@@ -239,7 +239,7 @@ public:
events.Repeat(30s); events.Repeat(30s);
break; break;
case EVENT_SPELL_TOUCH_OF_JARAXXUS: case EVENT_SPELL_TOUCH_OF_JARAXXUS:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
me->CastSpell(target, SPELL_TOUCH_OF_JARAXXUS, false); me->CastSpell(target, SPELL_TOUCH_OF_JARAXXUS, false);
events.Repeat(10s, 15s); events.Repeat(10s, 15s);
break; break;
@@ -266,7 +266,7 @@ public:
{ {
summons.DespawnAll(); summons.DespawnAll();
Talk(SAY_DEATH); Talk(SAY_DEATH);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_JARAXXUS, DONE); pInstance->SetData(TYPE_JARAXXUS, DONE);
} }
@@ -285,7 +285,7 @@ public:
events.Reset(); events.Reset();
summons.DespawnAll(); summons.DespawnAll();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 1); pInstance->SetData(TYPE_FAILED, 1);
} }
@@ -311,7 +311,7 @@ public:
void Reset() override void Reset() override
{ {
if( Unit* target = me->SelectNearestTarget(200.0f) ) if (Unit* target = me->SelectNearestTarget(200.0f))
{ {
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
@@ -322,20 +322,20 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_FEL_STEAK: case EVENT_SPELL_FEL_STEAK:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 44.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 44.0f, true))
{ {
DoResetThreatList(); DoResetThreatList();
me->AddThreat(target, 50000.0f); me->AddThreat(target, 50000.0f);
@@ -381,7 +381,7 @@ public:
void Reset() override void Reset() override
{ {
if( Unit* target = me->SelectNearestTarget(200.0f) ) if (Unit* target = me->SelectNearestTarget(200.0f))
{ {
AttackStart(target); AttackStart(target);
DoZoneInCombat(); DoZoneInCombat();
@@ -389,7 +389,7 @@ public:
events.Reset(); events.Reset();
events.RescheduleEvent(EVENT_SPELL_SHIVAN_SLASH, 10s, 20s); events.RescheduleEvent(EVENT_SPELL_SHIVAN_SLASH, 10s, 20s);
events.RescheduleEvent(EVENT_SPELL_SPINNING_PAIN_SPIKE, 22s, 30s); events.RescheduleEvent(EVENT_SPELL_SPINNING_PAIN_SPIKE, 22s, 30s);
if( IsHeroic() ) if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_MISTRESS_KISS, 10s, 15s); events.RescheduleEvent(EVENT_SPELL_MISTRESS_KISS, 10s, 15s);
} }
@@ -401,25 +401,25 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_SHIVAN_SLASH: case EVENT_SPELL_SHIVAN_SLASH:
if( me->GetVictim() ) if (me->GetVictim())
me->CastSpell(me->GetVictim(), SPELL_SHIVAN_SLASH, false); me->CastSpell(me->GetVictim(), SPELL_SHIVAN_SLASH, false);
events.Repeat(15s, 25s); events.Repeat(15s, 25s);
break; break;
case EVENT_SPELL_SPINNING_PAIN_SPIKE: case EVENT_SPELL_SPINNING_PAIN_SPIKE:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true))
me->CastSpell(target, SPELL_SPINNING_PAIN_SPIKE, false); me->CastSpell(target, SPELL_SPINNING_PAIN_SPIKE, false);
events.Repeat(25s, 30s); events.Repeat(25s, 30s);
break; break;
@@ -457,7 +457,7 @@ public:
{ {
if (Unit* caster = GetCaster()) if (Unit* caster = GetCaster())
if (Unit* target = GetTarget()) if (Unit* target = GetTarget())
if( target->HasUnitState(UNIT_STATE_CASTING) ) if (target->HasUnitState(UNIT_STATE_CASTING))
{ {
caster->CastSpell(target, 66359, true); caster->CastSpell(target, 66359, true);
SetDuration(0); SetDuration(0);
@@ -113,7 +113,7 @@ public:
void AttackStart(Unit* who) override void AttackStart(Unit* who) override
{ {
if( who->GetGUID() != TargetGUID ) if (who->GetGUID() != TargetGUID )
return; return;
ScriptedAI::AttackStart(who); ScriptedAI::AttackStart(who);
} }
@@ -122,26 +122,26 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !TargetGUID && !me->GetVehicle() ) if (!TargetGUID && !me->GetVehicle())
return; return;
Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID); Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID);
if( !t && !(t = me->GetVehicleBase()) ) if (!t && !(t = me->GetVehicleBase()))
return; return;
if( t->isDead() ) if (t->isDead())
{ {
t->RemoveAura(SPELL_CHANGE_VEHICLE); t->RemoveAura(SPELL_CHANGE_VEHICLE);
me->RemoveAllAuras(); me->RemoveAllAuras();
me->GetThreatMgr().ClearAllThreat(); me->GetThreatMgr().ClearAllThreat();
me->CombatStop(true); me->CombatStop(true);
me->SetHealth(me->GetMaxHealth()); me->SetHealth(me->GetMaxHealth());
if( pInstance ) if (pInstance)
if( Creature* gormok = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_GORMOK)) ) if (Creature* gormok = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_GORMOK)))
if( gormok->IsAlive() ) if (gormok->IsAlive())
if( Vehicle* vk = gormok->GetVehicleKit() ) if (Vehicle* vk = gormok->GetVehicleKit())
for( uint8 i = 0; i < 4; ++i ) for( uint8 i = 0; i < 4; ++i )
if( !vk->GetPassenger(i) ) if (!vk->GetPassenger(i))
{ {
me->EnterVehicleUnattackable(gormok, i); me->EnterVehicleUnattackable(gormok, i);
Reset(); Reset();
@@ -153,26 +153,26 @@ public:
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_SNOBOLLED: case EVENT_SPELL_SNOBOLLED:
if( t->IsPlayer() ) if (t->IsPlayer())
me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true); me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true);
break; break;
case EVENT_SPELL_BATTER: case EVENT_SPELL_BATTER:
if( t->IsPlayer() ) if (t->IsPlayer())
me->CastSpell(t, SPELL_BATTER); me->CastSpell(t, SPELL_BATTER);
events.Repeat(6s, 8s); events.Repeat(6s, 8s);
break; break;
case EVENT_SPELL_FIRE_BOMB: case EVENT_SPELL_FIRE_BOMB:
{ {
if( !t->IsPlayer() && pInstance ) if (!t->IsPlayer() && pInstance )
{ {
GuidVector validPlayers; GuidVector validPlayers;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
@@ -180,14 +180,14 @@ public:
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
{ {
if( Player* p = itr->GetSource() ) if (Player* p = itr->GetSource())
if( p->IsAlive() && p->GetGUID() != TargetGUID && (!gormok || !p->IsWithinMeleeRange(gormok)) ) if (p->IsAlive() && p->GetGUID() != TargetGUID && (!gormok || !p->IsWithinMeleeRange(gormok)))
validPlayers.push_back(p->GetGUID()); validPlayers.push_back(p->GetGUID());
} }
if( !validPlayers.empty() ) if (!validPlayers.empty())
if( Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))) ) if (Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))))
if( Creature* trigger = me->SummonCreature(NPC_FIRE_BOMB, *p, TEMPSUMMON_TIMED_DESPAWN, 60000) ) if (Creature* trigger = me->SummonCreature(NPC_FIRE_BOMB, *p, TEMPSUMMON_TIMED_DESPAWN, 60000))
{ {
me->CastSpell(trigger, SPELL_FIRE_BOMB_AURA, true); // periodic damage aura, speed 14.0f me->CastSpell(trigger, SPELL_FIRE_BOMB_AURA, true); // periodic damage aura, speed 14.0f
me->CastSpell(trigger, SPELL_FIRE_BOMB); // visual + initial damage 4k me->CastSpell(trigger, SPELL_FIRE_BOMB); // visual + initial damage 4k
@@ -198,7 +198,7 @@ public:
} }
break; break;
case EVENT_SPELL_HEAD_CRACK: case EVENT_SPELL_HEAD_CRACK:
if( t->IsPlayer() ) if (t->IsPlayer())
me->CastSpell(t, SPELL_HEAD_CRACK); me->CastSpell(t, SPELL_HEAD_CRACK);
events.Repeat(30s, 35s); events.Repeat(30s, 35s);
break; break;
@@ -209,17 +209,17 @@ public:
void JustDied(Unit* /*pKiller*/) override void JustDied(Unit* /*pKiller*/) override
{ {
if( Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID)) if (Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID))
{ {
t->RemoveAura(SPELL_CHANGE_VEHICLE); t->RemoveAura(SPELL_CHANGE_VEHICLE);
if( t->IsAlive() ) if (t->IsAlive())
t->RemoveAurasDueToSpell(SPELL_SNOBOLLED); t->RemoveAurasDueToSpell(SPELL_SNOBOLLED);
} }
} }
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
if( param == 1 && !TargetGUID ) if (param == 1 && !TargetGUID)
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
} }
}; };
@@ -265,9 +265,9 @@ public:
events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 16s, 24s); events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 16s, 24s);
// refresh snobold position // refresh snobold position
if( Vehicle* vk = me->GetVehicleKit() ) if (Vehicle* vk = me->GetVehicleKit())
for( uint8 i = 0; i < 4; ++i ) for( uint8 i = 0; i < 4; ++i )
if( Unit* snobold = vk->GetPassenger(i) ) if (Unit* snobold = vk->GetPassenger(i))
snobold->SendMovementFlagUpdate(); snobold->SendMovementFlagUpdate();
} }
@@ -280,22 +280,22 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_IMPALE: case EVENT_SPELL_IMPALE:
if( !me->HasUnitFlag(UNIT_FLAG_DISARMED) ) if (!me->HasUnitFlag(UNIT_FLAG_DISARMED))
{ {
if( Unit* victim = me->GetVictim() ) if (Unit* victim = me->GetVictim())
me->CastSpell(victim, SPELL_IMPALE, false); me->CastSpell(victim, SPELL_IMPALE, false);
events.Repeat(9s, 10s); events.Repeat(9s, 10s);
} }
@@ -307,21 +307,21 @@ public:
events.Repeat(20s, 25s); events.Repeat(20s, 25s);
break; break;
case EVENT_PICK_SNOBOLD_TARGET: case EVENT_PICK_SNOBOLD_TARGET:
if( Vehicle* vk = me->GetVehicleKit() ) if (Vehicle* vk = me->GetVehicleKit())
for( uint8 i = 0; i < 4; ++i ) for( uint8 i = 0; i < 4; ++i )
if( Unit* snobold = vk->GetPassenger(i) ) if (Unit* snobold = vk->GetPassenger(i))
{ {
GuidVector validPlayers; GuidVector validPlayers;
Map::PlayerList const& pl = me->GetMap()->GetPlayers(); Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
{ {
if( Player* p = itr->GetSource() ) if (Player* p = itr->GetSource())
if( p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() && !p->IsGameMaster() ) if (p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() && !p->IsGameMaster())
validPlayers.push_back(p->GetGUID()); validPlayers.push_back(p->GetGUID());
} }
if( !validPlayers.empty() ) if (!validPlayers.empty())
if( Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))) ) if (Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))))
{ {
snobold->ChangeSeat(4); // switch to hand snobold->ChangeSeat(4); // switch to hand
me->setAttackTimer(BASE_ATTACK, 3000); me->setAttackTimer(BASE_ATTACK, 3000);
@@ -337,12 +337,12 @@ public:
{ {
me->CastSpell(me, SPELL_RISING_ANGER, true); me->CastSpell(me, SPELL_RISING_ANGER, true);
Player* p = ObjectAccessor::GetPlayer(*me, PlayerGUID); Player* p = ObjectAccessor::GetPlayer(*me, PlayerGUID);
if( p && p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() ) if (p && p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle())
{ {
if( Vehicle* vk = me->GetVehicleKit() ) if (Vehicle* vk = me->GetVehicleKit())
if( Unit* snobold = vk->GetPassenger(4) ) if (Unit* snobold = vk->GetPassenger(4))
{ {
if( snobold->IsCreature() ) if (snobold->IsCreature())
{ {
CAST_AI(npc_snobold_vassal::npc_snobold_vassalAI, snobold->ToCreature()->AI())->TargetGUID = PlayerGUID; CAST_AI(npc_snobold_vassal::npc_snobold_vassalAI, snobold->ToCreature()->AI())->TargetGUID = PlayerGUID;
snobold->ToCreature()->AI()->AttackStart(p); snobold->ToCreature()->AI()->AttackStart(p);
@@ -353,21 +353,21 @@ public:
//snobold->ClearUnitState(UNIT_STATE_ONVEHICLE); //snobold->ClearUnitState(UNIT_STATE_ONVEHICLE);
} }
} }
else if( Vehicle* vk = me->GetVehicleKit() ) else if (Vehicle* vk = me->GetVehicleKit())
{ {
events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 5s); events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 5s);
if( Unit* snobold = vk->GetPassenger(4) ) if (Unit* snobold = vk->GetPassenger(4))
if( snobold->IsCreature() ) if (snobold->IsCreature())
{ {
bool needDespawn = true; bool needDespawn = true;
for( uint8 i = 0; i < 4; ++i ) for( uint8 i = 0; i < 4; ++i )
if( !vk->GetPassenger(i) ) if (!vk->GetPassenger(i))
{ {
snobold->ChangeSeat(i); snobold->ChangeSeat(i);
needDespawn = false; needDespawn = false;
break; break;
} }
if( needDespawn ) if (needDespawn)
snobold->ToCreature()->DespawnOrUnsummon(); snobold->ToCreature()->DespawnOrUnsummon();
} }
} }
@@ -383,7 +383,7 @@ public:
{ {
summons.DoAction(1); summons.DoAction(1);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_GORMOK, DONE); pInstance->SetData(TYPE_GORMOK, DONE);
} }
@@ -394,7 +394,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
switch( param ) switch (param)
{ {
case -1: case -1:
summons.DespawnAll(); summons.DespawnAll();
@@ -407,7 +407,7 @@ public:
events.Reset(); events.Reset();
summons.DespawnAll(); summons.DespawnAll();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 1); pInstance->SetData(TYPE_FAILED, 1);
} }
}; };
@@ -488,16 +488,16 @@ struct boss_jormungarAI : public ScriptedAI
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
switch( param ) switch (param)
{ {
case -1: case -1:
if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
events.RescheduleEvent(EVENT_SUBMERGE, 1500ms); events.RescheduleEvent(EVENT_SUBMERGE, 1500ms);
break; break;
case -2: case -2:
if( me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) if (me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
bIsStationary = true; // it will come out mobile soon bIsStationary = true; // it will come out mobile soon
else if( me->GetDisplayId() == _MODEL_STATIONARY ) else if (me->GetDisplayId() == _MODEL_STATIONARY )
events.RescheduleEvent(EVENT_SUBMERGE, 1s); events.RescheduleEvent(EVENT_SUBMERGE, 1s);
else else
events.CancelEvent(EVENT_SUBMERGE); events.CancelEvent(EVENT_SUBMERGE);
@@ -510,7 +510,7 @@ struct boss_jormungarAI : public ScriptedAI
void ScheduleEvents() void ScheduleEvents()
{ {
events.Reset(); events.Reset();
if( me->GetDisplayId() == _MODEL_STATIONARY ) if (me->GetDisplayId() == _MODEL_STATIONARY )
{ {
me->SetAttackTime(BASE_ATTACK, 1500); me->SetAttackTime(BASE_ATTACK, 1500);
events.RescheduleEvent(EVENT_SPELL_SPRAY, (me->GetEntry() == NPC_ACIDMAW ? 20s : 15s)); events.RescheduleEvent(EVENT_SPELL_SPRAY, (me->GetEntry() == NPC_ACIDMAW ? 20s : 15s));
@@ -523,7 +523,7 @@ struct boss_jormungarAI : public ScriptedAI
events.RescheduleEvent(EVENT_SPELL_SPEW, 15s, 30s); events.RescheduleEvent(EVENT_SPELL_SPEW, 15s, 30s);
events.RescheduleEvent(EVENT_SPELL_SLIME_POOL, 15s); events.RescheduleEvent(EVENT_SPELL_SLIME_POOL, 15s);
} }
if( !me->HasAura(SPELL_ENRAGE) ) if (!me->HasAura(SPELL_ENRAGE))
events.RescheduleEvent(EVENT_SUBMERGE, 45s, 50s); events.RescheduleEvent(EVENT_SUBMERGE, 45s, 50s);
} }
@@ -540,11 +540,11 @@ struct boss_jormungarAI : public ScriptedAI
void AttackStart(Unit* who) override void AttackStart(Unit* who) override
{ {
if( me->GetDisplayId() == _MODEL_STATIONARY ) if (me->GetDisplayId() == _MODEL_STATIONARY )
{ {
if( !who ) if (!who)
return; return;
if( me->Attack(who, true) ) if (me->Attack(who, true))
DoStartNoMovement(who); DoStartNoMovement(who);
} }
else else
@@ -553,15 +553,15 @@ struct boss_jormungarAI : public ScriptedAI
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -573,8 +573,8 @@ struct boss_jormungarAI : public ScriptedAI
Talk(EMOTE_SUBMERGE); Talk(EMOTE_SUBMERGE);
// second one submerge 1.5sec after the first one, used also for synchronizing // second one submerge 1.5sec after the first one, used also for synchronizing
if( pInstance ) if (pInstance)
if( Creature* c = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(_TYPE_OTHER)) ) if (Creature* c = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(_TYPE_OTHER)))
c->AI()->DoAction(-1); c->AI()->DoAction(-1);
events.Reset(); events.Reset();
@@ -584,7 +584,7 @@ struct boss_jormungarAI : public ScriptedAI
case EVENT_MOVE_UNDERGROUND: case EVENT_MOVE_UNDERGROUND:
{ {
float angle = me->GetAngle(Locs[LOC_CENTER].GetPositionX() + urand(0, 20) - 10.0f, Locs[LOC_CENTER].GetPositionY() + urand(0, 20) - 10.0f), dist = urand(10, 35); float angle = me->GetAngle(Locs[LOC_CENTER].GetPositionX() + urand(0, 20) - 10.0f, Locs[LOC_CENTER].GetPositionY() + urand(0, 20) - 10.0f), dist = urand(10, 35);
if( Creature* c = me->SummonCreature(NPC_WORLD_TRIGGER, *me, TEMPSUMMON_TIMED_DESPAWN, 6000) ) if (Creature* c = me->SummonCreature(NPC_WORLD_TRIGGER, *me, TEMPSUMMON_TIMED_DESPAWN, 6000))
{ {
c->SetSpeed(MOVE_RUN, 2.5f); c->SetSpeed(MOVE_RUN, 2.5f);
c->CastSpell(c, SPELL_CHURNING_GROUND, true); c->CastSpell(c, SPELL_CHURNING_GROUND, true);
@@ -603,11 +603,11 @@ struct boss_jormungarAI : public ScriptedAI
me->GetMotionMaster()->Clear(); me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
me->StopMoving(); me->StopMoving();
if( bIsStationary ) if (bIsStationary)
{ {
me->SetNativeDisplayId(_MODEL_MOBILE); me->SetNativeDisplayId(_MODEL_MOBILE);
me->SetCombatMovement(true); me->SetCombatMovement(true);
if( Unit* victim = me->GetVictim() ) if (Unit* victim = me->GetVictim())
me->GetMotionMaster()->MoveChase(victim); me->GetMotionMaster()->MoveChase(victim);
} }
else else
@@ -623,7 +623,7 @@ struct boss_jormungarAI : public ScriptedAI
} }
break; break;
case EVENT_SPELL_SPRAY: case EVENT_SPELL_SPRAY:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
me->CastSpell(target, _SPELL_SPRAY, false); me->CastSpell(target, _SPELL_SPRAY, false);
events.Repeat(20s); events.Repeat(20s);
break; break;
@@ -632,7 +632,7 @@ struct boss_jormungarAI : public ScriptedAI
events.Repeat(15s, 30s); events.Repeat(15s, 30s);
break; break;
case EVENT_SPELL_BITE: case EVENT_SPELL_BITE:
if( Unit* victim = me->GetVictim() ) if (Unit* victim = me->GetVictim())
me->CastSpell(victim, _SPELL_BITE, false); me->CastSpell(victim, _SPELL_BITE, false);
events.Repeat(20s); events.Repeat(20s);
break; break;
@@ -641,15 +641,15 @@ struct boss_jormungarAI : public ScriptedAI
events.Repeat(15s, 30s); events.Repeat(15s, 30s);
break; break;
case EVENT_SPELL_SLIME_POOL: case EVENT_SPELL_SLIME_POOL:
if( Creature* c = me->SummonCreature(NPC_SLIME_POOL, *me, TEMPSUMMON_TIMED_DESPAWN, 30000) ) if (Creature* c = me->SummonCreature(NPC_SLIME_POOL, *me, TEMPSUMMON_TIMED_DESPAWN, 30000))
c->CastSpell(c, SPELL_SLIME_POOL_EFFECT, true); c->CastSpell(c, SPELL_SLIME_POOL_EFFECT, true);
events.Repeat(30s); events.Repeat(30s);
break; break;
} }
if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
{ {
if( me->GetDisplayId() == _MODEL_STATIONARY ) if (me->GetDisplayId() == _MODEL_STATIONARY )
DoSpellAttackIfReady(_SPELL_SPIT); DoSpellAttackIfReady(_SPELL_SPIT);
else else
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
@@ -658,10 +658,10 @@ struct boss_jormungarAI : public ScriptedAI
void JustDied(Unit* /*pKiller*/) override void JustDied(Unit* /*pKiller*/) override
{ {
if( pInstance ) if (pInstance)
{ {
if( Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(_TYPE_OTHER)) ) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(_TYPE_OTHER)))
if( c->IsAlive() ) if (c->IsAlive())
c->AI()->DoAction(-2); c->AI()->DoAction(-2);
pInstance->SetData(TYPE_JORMUNGAR, DONE); pInstance->SetData(TYPE_JORMUNGAR, DONE);
} }
@@ -671,7 +671,7 @@ struct boss_jormungarAI : public ScriptedAI
{ {
events.Reset(); events.Reset();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 1); pInstance->SetData(TYPE_FAILED, 1);
} }
}; };
@@ -817,8 +817,8 @@ public:
{ {
Map::PlayerList const& lPlayers = me->GetMap()->GetPlayers(); Map::PlayerList const& lPlayers = me->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr ) for( Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr )
if( Unit* p = itr->GetSource() ) if (Unit* p = itr->GetSource())
if( p->IsAlive() && p->GetExactDist(me) <= 12.0f ) if (p->IsAlive() && p->GetExactDist(me) <= 12.0f )
{ {
DoCastAOE(SPELL_TRAMPLE); DoCastAOE(SPELL_TRAMPLE);
return true; return true;
@@ -829,7 +829,7 @@ public:
void MovementInform(uint32 /*type*/, uint32 id) override void MovementInform(uint32 /*type*/, uint32 id) override
{ {
if( id == EVENT_CHARGE ) if (id == EVENT_CHARGE)
{ {
events.Reset(); events.Reset();
events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s); events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s);
@@ -843,7 +843,7 @@ public:
me->UpdatePosition(destX, destY, destZ, angle, true); me->UpdatePosition(destX, destY, destZ, angle, true);
me->StopMovingOnCurrentPos(); me->StopMovingOnCurrentPos();
if( !DoTrampleIfValid() ) if (!DoTrampleIfValid())
{ {
me->CastSpell(me, SPELL_STAGGERED_DAZE, true); me->CastSpell(me, SPELL_STAGGERED_DAZE, true);
me->CastSpell((Unit*)nullptr, SPELL_TRAMPLE, true); me->CastSpell((Unit*)nullptr, SPELL_TRAMPLE, true);
@@ -862,20 +862,20 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_FEROCIOUS_BUTT: case EVENT_SPELL_FEROCIOUS_BUTT:
if( Unit* victim = me->GetVictim() ) if (Unit* victim = me->GetVictim())
me->CastSpell(victim, SPELL_FEROCIOUS_BUTT, false); me->CastSpell(victim, SPELL_FEROCIOUS_BUTT, false);
events.Repeat(15s, 30s); events.Repeat(15s, 30s);
break; break;
@@ -884,7 +884,7 @@ public:
events.Repeat(15s, 20s); events.Repeat(15s, 20s);
break; break;
case EVENT_SPELL_ARCTIC_BREATH: case EVENT_SPELL_ARCTIC_BREATH:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true))
me->CastSpell(target, SPELL_ARCTIC_BREATH, false); me->CastSpell(target, SPELL_ARCTIC_BREATH, false);
events.Repeat(20s, 30s); events.Repeat(20s, 30s);
break; break;
@@ -906,7 +906,7 @@ public:
events.RescheduleEvent(EVENT_GAZE, 2s); events.RescheduleEvent(EVENT_GAZE, 2s);
break; break;
case EVENT_GAZE: case EVENT_GAZE:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 500.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 500.0f, true))
{ {
TargetGUID = target->GetGUID(); TargetGUID = target->GetGUID();
me->SetGuidValue(UNIT_FIELD_TARGET, TargetGUID); me->SetGuidValue(UNIT_FIELD_TARGET, TargetGUID);
@@ -929,14 +929,14 @@ public:
case EVENT_JUMP_BACK: case EVENT_JUMP_BACK:
{ {
float angle; float angle;
if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID))
angle = me->GetAngle(target); angle = me->GetAngle(target);
else // in case something went wrong else // in case something went wrong
angle = rand_norm() * 2 * M_PI; angle = rand_norm() * 2 * M_PI;
float jumpangle = angle >= M_PI ? angle - M_PI : angle + M_PI; float jumpangle = angle >= M_PI ? angle - M_PI : angle + M_PI;
float dist = 50.0f; float dist = 50.0f;
if( angle > 1.0f && angle < 2.0f ) // near main gate if (angle > 1.0f && angle < 2.0f) // near main gate
dist = 46.0f; dist = 46.0f;
destX = Locs[LOC_CENTER].GetPositionX() + cos(angle) * dist; destX = Locs[LOC_CENTER].GetPositionX() + cos(angle) * dist;
destY = Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * dist; destY = Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * dist;
@@ -946,8 +946,8 @@ public:
events.RescheduleEvent(EVENT_TRAMPLE, 1500ms); events.RescheduleEvent(EVENT_TRAMPLE, 1500ms);
if( pInstance ) if (pInstance)
switch( GetDifficulty() ) switch (GetDifficulty())
{ {
case RAID_DIFFICULTY_10MAN_NORMAL: case RAID_DIFFICULTY_10MAN_NORMAL:
pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MASSIVE_CRASH); pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MASSIVE_CRASH);
@@ -976,7 +976,7 @@ public:
break; break;
case EVENT_CHECK_TRAMPLE_PLAYERS: case EVENT_CHECK_TRAMPLE_PLAYERS:
if( DoTrampleIfValid() ) if (DoTrampleIfValid())
{ {
events.Reset(); events.Reset();
events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s); events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s);
@@ -996,7 +996,7 @@ public:
break; break;
} }
if( me->GetReactState() != REACT_PASSIVE ) if (me->GetReactState() != REACT_PASSIVE )
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -1004,13 +1004,13 @@ public:
{ {
events.Reset(); events.Reset();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 1); pInstance->SetData(TYPE_FAILED, 1);
} }
void JustDied(Unit* /*killer*/) override void JustDied(Unit* /*killer*/) override
{ {
if( !pInstance ) if (!pInstance)
return; return;
pInstance->SetData(TYPE_ICEHOWL, DONE); pInstance->SetData(TYPE_ICEHOWL, DONE);
@@ -116,9 +116,9 @@ struct boss_twin_valkyrAI : public ScriptedAI
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_HASTE_SPELLS, true); me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_HASTE_SPELLS, true);
events.Reset(); events.Reset();
if( me->GetEntry() == NPC_LIGHTBANE ) if (me->GetEntry() == NPC_LIGHTBANE )
{ {
if( pInstance ) if (pInstance)
pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853); pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853);
// special events here // special events here
@@ -127,7 +127,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
events.RescheduleEvent(EVENT_SPECIAL, 45s); events.RescheduleEvent(EVENT_SPECIAL, 45s);
} }
events.RescheduleEvent(EVENT_SPELL_SPIKE, 5s, 8s); events.RescheduleEvent(EVENT_SPELL_SPIKE, 5s, 8s);
if( IsHeroic() ) if (IsHeroic())
events.RescheduleEvent(EVENT_SPELL_TOUCH, 10s, 25s, 1); events.RescheduleEvent(EVENT_SPELL_TOUCH, 10s, 25s, 1);
me->SetCanFly(true); me->SetCanFly(true);
@@ -142,14 +142,14 @@ struct boss_twin_valkyrAI : public ScriptedAI
void DoAction(int32 a) override void DoAction(int32 a) override
{ {
switch( a ) switch (a)
{ {
case -1: case -1:
summons.DespawnAll(); summons.DespawnAll();
if( pInstance && me->GetEntry() == NPC_LIGHTBANE ) if (pInstance && me->GetEntry() == NPC_LIGHTBANE )
{ {
uint32 essenceId1 = 0, empoweredId1 = 0, touchId1 = 0, essenceId2 = 0, empoweredId2 = 0, touchId2 = 0; uint32 essenceId1 = 0, empoweredId1 = 0, touchId1 = 0, essenceId2 = 0, empoweredId2 = 0, touchId2 = 0;
switch( me->GetMap()->GetDifficulty() ) switch (me->GetMap()->GetDifficulty())
{ {
case 0: case 0:
essenceId1 = 65684; essenceId1 = 65684;
@@ -207,7 +207,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
/*void AttackStart(Unit* victim) /*void AttackStart(Unit* victim)
{ {
if( victim && me->Attack(victim, true) ) if (victim && me->Attack(victim, true))
me->GetMotionMaster()->MoveChase(victim, 0.0f, 0.0f, 6.0f); me->GetMotionMaster()->MoveChase(victim, 0.0f, 0.0f, 6.0f);
}*/ }*/
@@ -216,15 +216,15 @@ struct boss_twin_valkyrAI : public ScriptedAI
me->setActive(true); me->setActive(true);
me->LowerPlayerDamageReq(me->GetMaxHealth()); me->LowerPlayerDamageReq(me->GetMaxHealth());
DoZoneInCombat(); DoZoneInCombat();
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
if( !twin->IsInCombat() ) if (!twin->IsInCombat())
if( Unit* target = twin->SelectNearestTarget(200.0f) ) if (Unit* target = twin->SelectNearestTarget(200.0f))
twin->AI()->AttackStart(target); twin->AI()->AttackStart(target);
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
me->CastSpell(me, me->GetEntry() == NPC_LIGHTBANE ? SPELL_LIGHT_SURGE : SPELL_DARK_SURGE, true); me->CastSpell(me, me->GetEntry() == NPC_LIGHTBANE ? SPELL_LIGHT_SURGE : SPELL_DARK_SURGE, true);
if( pInstance && me->GetEntry() == NPC_LIGHTBANE ) if (pInstance && me->GetEntry() == NPC_LIGHTBANE )
pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853); pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853);
} }
@@ -265,13 +265,13 @@ struct boss_twin_valkyrAI : public ScriptedAI
void UpdateSharedHealth() void UpdateSharedHealth()
{ {
// lightbane synchronizes // lightbane synchronizes
if( me->GetEntry() == NPC_LIGHTBANE ) if (me->GetEntry() == NPC_LIGHTBANE )
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
if( twin->IsAlive() && me->IsAlive() ) if (twin->IsAlive() && me->IsAlive())
{ {
int32 d = CAST_AI(boss_twin_valkyrAI, twin->AI())->LastSynchroHP - (int32)twin->GetHealth(); int32 d = CAST_AI(boss_twin_valkyrAI, twin->AI())->LastSynchroHP - (int32)twin->GetHealth();
int32 newhealth = (int32)me->GetHealth() - d; int32 newhealth = (int32)me->GetHealth() - d;
if( newhealth <= 0 ) if (newhealth <= 0)
newhealth = 1; newhealth = 1;
me->SetHealth( (uint32)newhealth ); me->SetHealth( (uint32)newhealth );
twin->SetHealth(me->GetHealth()); twin->SetHealth(me->GetHealth());
@@ -281,25 +281,25 @@ struct boss_twin_valkyrAI : public ScriptedAI
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
UpdateSharedHealth(); UpdateSharedHealth();
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
uint8 eventId = events.ExecuteEvent(); uint8 eventId = events.ExecuteEvent();
switch(eventId) switch (eventId)
{ {
case 0: case 0:
break; break;
case EVENT_BERSERK: case EVENT_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true); me->CastSpell(me, SPELL_BERSERK, true);
Talk(SAY_BERSERK); Talk(SAY_BERSERK);
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
{ {
twin->CastSpell(twin, SPELL_BERSERK, true); twin->CastSpell(twin, SPELL_BERSERK, true);
twin->AI()->Talk(SAY_BERSERK); twin->AI()->Talk(SAY_BERSERK);
@@ -311,18 +311,18 @@ struct boss_twin_valkyrAI : public ScriptedAI
case EVENT_SUMMON_BALLS_3: case EVENT_SUMMON_BALLS_3:
{ {
uint8 count = 0; uint8 count = 0;
if( IsHeroic() ) if (IsHeroic())
count = eventId == EVENT_SUMMON_BALLS_3 ? 36 : 6; count = eventId == EVENT_SUMMON_BALLS_3 ? 36 : 6;
else else
count = eventId == EVENT_SUMMON_BALLS_3 ? 24 : 4; count = eventId == EVENT_SUMMON_BALLS_3 ? 24 : 4;
for( uint8 i = 0; i < count; ++i ) for( uint8 i = 0; i < count; ++i )
{ {
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
if( Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500) ) if (Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500))
boss_twin_valkyrAI::JustSummoned(ball); boss_twin_valkyrAI::JustSummoned(ball);
} }
switch( eventId ) switch (eventId)
{ {
case EVENT_SUMMON_BALLS_1: case EVENT_SUMMON_BALLS_1:
events.RescheduleEvent(EVENT_SUMMON_BALLS_2, 8s); events.RescheduleEvent(EVENT_SUMMON_BALLS_2, 8s);
@@ -343,10 +343,10 @@ struct boss_twin_valkyrAI : public ScriptedAI
case EVENT_SPELL_TOUCH: case EVENT_SPELL_TOUCH:
{ {
uint32 essenceId = 0; uint32 essenceId = 0;
switch( me->GetEntry() ) switch (me->GetEntry())
{ {
case NPC_LIGHTBANE: case NPC_LIGHTBANE:
switch( GetDifficulty() ) switch (GetDifficulty())
{ {
case 0: case 0:
essenceId = 65684; essenceId = 65684;
@@ -363,7 +363,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
} }
break; break;
case NPC_DARKBANE: case NPC_DARKBANE:
switch( GetDifficulty() ) switch (GetDifficulty())
{ {
case 0: case 0:
essenceId = 65686; essenceId = 65686;
@@ -382,7 +382,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
} }
/* /*
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, essenceId) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, essenceId))
me->CastSpell(target, me->GetEntry()==NPC_LIGHTBANE ? SPELL_LIGHT_TOUCH : SPELL_DARK_TOUCH, false); me->CastSpell(target, me->GetEntry()==NPC_LIGHTBANE ? SPELL_LIGHT_TOUCH : SPELL_DARK_TOUCH, false);
events.RepeatEvent(urand(45000,50000)); events.RepeatEvent(urand(45000,50000));
*/ */
@@ -414,17 +414,17 @@ struct boss_twin_valkyrAI : public ScriptedAI
do s = urand(0, 3); do s = urand(0, 3);
while( SpecialMask & (1 << s) && (SpecialMask & 0xF) != 0xF ); while( SpecialMask & (1 << s) && (SpecialMask & 0xF) != 0xF );
SpecialMask |= (1 << s); SpecialMask |= (1 << s);
switch( s ) switch (s)
{ {
case 0: // light vortex case 0: // light vortex
me->CastSpell((Unit*)nullptr, SPELL_LIGHT_VORTEX, false); me->CastSpell((Unit*)nullptr, SPELL_LIGHT_VORTEX, false);
Talk(EMOTE_VORTEX); Talk(EMOTE_VORTEX);
Talk(SAY_LIGHT); Talk(SAY_LIGHT);
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
twin->AI()->Talk(SAY_LIGHT); twin->AI()->Talk(SAY_LIGHT);
break; break;
case 1: // dark vortex case 1: // dark vortex
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
{ {
twin->CastSpell((Unit*)nullptr, SPELL_DARK_VORTEX, false); twin->CastSpell((Unit*)nullptr, SPELL_DARK_VORTEX, false);
twin->AI()->Talk(EMOTE_VORTEX); twin->AI()->Talk(EMOTE_VORTEX);
@@ -435,7 +435,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
case 2: // light pact case 2: // light pact
Talk(EMOTE_TWINK_PACT); Talk(EMOTE_TWINK_PACT);
Talk(SAY_TWINK_PACT); Talk(SAY_TWINK_PACT);
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
{ {
twin->AI()->Talk(SAY_TWINK_PACT); twin->AI()->Talk(SAY_TWINK_PACT);
twin->AI()->DoAction(-3); twin->AI()->DoAction(-3);
@@ -444,7 +444,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
me->CastSpell(me, SPELL_LIGHT_TWIN_PACT, false); me->CastSpell(me, SPELL_LIGHT_TWIN_PACT, false);
break; break;
case 3: // dark pact case 3: // dark pact
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
{ {
twin->AI()->Talk(EMOTE_TWINK_PACT); twin->AI()->Talk(EMOTE_TWINK_PACT);
twin->AI()->Talk(SAY_TWINK_PACT); twin->AI()->Talk(SAY_TWINK_PACT);
@@ -455,7 +455,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
} }
break; break;
} }
if( (SpecialMask & 0xF) == 0xF ) if ((SpecialMask & 0xF) == 0xF )
SpecialMask = 0; SpecialMask = 0;
events.Repeat(45s); events.Repeat(45s);
events.DelayEventsToMax(15000, 1); // no touch of light/darkness during special abilities! events.DelayEventsToMax(15000, 1); // no touch of light/darkness during special abilities!
@@ -474,13 +474,13 @@ struct boss_twin_valkyrAI : public ScriptedAI
{ {
DoAction(-1); DoAction(-1);
Talk(SAY_DEATH); Talk(SAY_DEATH);
if( pInstance ) if (pInstance)
{ {
pInstance->SetData(TYPE_VALKYR, DONE); pInstance->SetData(TYPE_VALKYR, DONE);
pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP); pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP);
} }
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
if( twin->IsAlive() ) if (twin->IsAlive())
{ {
twin->SetHealth(1); twin->SetHealth(1);
Unit::Kill(twin, twin); Unit::Kill(twin, twin);
@@ -499,17 +499,17 @@ struct boss_twin_valkyrAI : public ScriptedAI
void KilledUnit(Unit* who) override void KilledUnit(Unit* who) override
{ {
if( who->IsPlayer() ) if (who->IsPlayer())
{ {
Talk(SAY_KILL_PLAYER); Talk(SAY_KILL_PLAYER);
if( Creature* twin = GetSister() ) if (Creature* twin = GetSister())
twin->AI()->Talk(SAY_KILL_PLAYER); twin->AI()->Talk(SAY_KILL_PLAYER);
} }
} }
void EnterEvadeMode(EvadeReason /* why */) override void EnterEvadeMode(EvadeReason /* why */) override
{ {
if( pInstance ) if (pInstance)
pInstance->SetData(TYPE_FAILED, 0); pInstance->SetData(TYPE_FAILED, 0);
} }
}; };
@@ -530,9 +530,9 @@ public:
{ {
me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (19 - 1)); me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (19 - 1));
SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_OFFHAND_2, EQUIP_RANGED_2); SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_OFFHAND_2, EQUIP_RANGED_2);
if( Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_1]) ) if (Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_1]))
boss_twin_valkyrAI::JustSummoned(c); boss_twin_valkyrAI::JustSummoned(c);
if( Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_2]) ) if (Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_2]))
boss_twin_valkyrAI::JustSummoned(c); boss_twin_valkyrAI::JustSummoned(c);
} }
@@ -556,9 +556,9 @@ public:
{ {
me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (22 - 1)); me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (22 - 1));
SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1); SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1);
if( Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_1]) ) if (Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_1]))
boss_twin_valkyrAI::JustSummoned(c); boss_twin_valkyrAI::JustSummoned(c);
if( Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_2]) ) if (Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_2]))
boss_twin_valkyrAI::JustSummoned(c); boss_twin_valkyrAI::JustSummoned(c);
} }
@@ -573,7 +573,7 @@ public:
bool OnGossipHello(Player* player, Creature* creature) override bool OnGossipHello(Player* player, Creature* creature) override
{ {
switch( creature->GetEntry() ) switch (creature->GetEntry())
{ {
case NPC_LIGHT_ESSENCE: case NPC_LIGHT_ESSENCE:
{ {
@@ -582,7 +582,7 @@ public:
//uint32 empoweredId = 0; //uint32 empoweredId = 0;
uint32 touchId1 = 0; uint32 touchId1 = 0;
//uint32 touchId2 = 0; //uint32 touchId2 = 0;
switch( creature->GetMap()->GetDifficulty() ) switch (creature->GetMap()->GetDifficulty())
{ {
case 0: case 0:
essenceId = 65684; essenceId = 65684;
@@ -628,7 +628,7 @@ public:
//uint32 empoweredId = 0; //uint32 empoweredId = 0;
//uint32 touchId1 = 0; //uint32 touchId1 = 0;
uint32 touchId2 = 0; uint32 touchId2 = 0;
switch( creature->GetMap()->GetDifficulty() ) switch (creature->GetMap()->GetDifficulty())
{ {
case 0: case 0:
essenceId = 65686; essenceId = 65686;
@@ -706,10 +706,10 @@ public:
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) override
{ {
if( type != POINT_MOTION_TYPE || id != 0 ) if (type != POINT_MOTION_TYPE || id != 0)
return; return;
if( urand(0, 2) ) if (urand(0, 2))
me->DespawnOrUnsummon(0); me->DespawnOrUnsummon(0);
} }
@@ -721,10 +721,10 @@ public:
void UpdateAI(uint32 /*diff*/) override void UpdateAI(uint32 /*diff*/) override
{ {
if( despawning ) if (despawning)
return; return;
if( me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE )
MoveToNextPoint(); MoveToNextPoint();
} }
}; };
@@ -742,15 +742,15 @@ public:
void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& /*dmgInfo*/, uint32& absorbAmount) void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& /*dmgInfo*/, uint32& absorbAmount)
{ {
uint16 count = absorbAmount / 1000; uint16 count = absorbAmount / 1000;
if( !count || !GetOwner() ) if (!count || !GetOwner())
return; return;
if( SpellInfo const* se = GetAura()->GetSpellInfo() ) if (SpellInfo const* se = GetAura()->GetSpellInfo())
if( Unit* owner = GetOwner()->ToUnit() ) if (Unit* owner = GetOwner()->ToUnit())
{ {
uint32 auraId = 0; uint32 auraId = 0;
uint32 empoweredId = 0; uint32 empoweredId = 0;
switch( se->Id ) switch (se->Id)
{ {
case 65686: case 65686:
auraId = 67590; auraId = 67590;
@@ -785,15 +785,15 @@ public:
empoweredId = 65724; empoweredId = 65724;
break; break;
} }
if( !owner->HasAura(auraId) ) if (!owner->HasAura(auraId))
{ {
owner->CastSpell(owner, SPELL_POWERING_UP, true); owner->CastSpell(owner, SPELL_POWERING_UP, true);
if( --count == 0 ) if (--count == 0)
return; return;
} }
if( Aura* aur = owner->GetAura(auraId) ) if (Aura* aur = owner->GetAura(auraId))
{ {
if( aur->GetStackAmount() + count < 100 ) if (aur->GetStackAmount() + count < 100 )
{ {
aur->ModStackAmount(count); aur->ModStackAmount(count);
@@ -834,15 +834,15 @@ public:
{ {
PreventDefaultAction(); PreventDefaultAction();
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if( !caster ) if (!caster)
return; return;
if( caster->GetMap()->GetId() == 649 ) if (caster->GetMap()->GetId() == 649 )
{ {
uint32 excludedID = GetSpellInfo()->ExcludeTargetAuraSpell; uint32 excludedID = GetSpellInfo()->ExcludeTargetAuraSpell;
Map::PlayerList const& pl = caster->GetMap()->GetPlayers(); Map::PlayerList const& pl = caster->GetMap()->GetPlayers();
for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr )
if( Player* plr = itr->GetSource() ) if (Player* plr = itr->GetSource())
if( plr->IsAlive() && !plr->HasAura(excludedID) && !plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION) ) if (plr->IsAlive() && !plr->HasAura(excludedID) && !plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
{ {
uint32 absorb = 0; uint32 absorb = 0;
uint32 resist = 0; uint32 resist = 0;
@@ -36,15 +36,15 @@ public:
bool OnGossipHello(Player* player, Creature* creature) override bool OnGossipHello(Player* player, Creature* creature) override
{ {
if(!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP))
return true; return true;
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if(!pInstance) if (!pInstance)
return true; return true;
uint32 gossipTextId = 0; uint32 gossipTextId = 0;
switch(pInstance->GetData(TYPE_INSTANCE_PROGRESS)) switch (pInstance->GetData(TYPE_INSTANCE_PROGRESS))
{ {
case INSTANCE_PROGRESS_INITIAL: case INSTANCE_PROGRESS_INITIAL:
gossipTextId = MSG_TESTED; gossipTextId = MSG_TESTED;
@@ -72,14 +72,14 @@ public:
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 uiAction) override bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 uiAction) override
{ {
if( !creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP) ) if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP))
return true; return true;
InstanceScript* pInstance = creature->GetInstanceScript(); InstanceScript* pInstance = creature->GetInstanceScript();
if( !pInstance ) if (!pInstance)
return true; return true;
if( uiAction == GOSSIP_ACTION_INFO_DEF + 1337 ) if (uiAction == GOSSIP_ACTION_INFO_DEF + 1337)
{ {
pInstance->SetData(TYPE_ANNOUNCER_GOSSIP_SELECT, 0); pInstance->SetData(TYPE_ANNOUNCER_GOSSIP_SELECT, 0);
creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
@@ -133,7 +133,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_SPELL_INFECTED_WOUND: case EVENT_SPELL_INFECTED_WOUND:
me->CastSpell(me->GetVictim(), SPELL_INFECTED_WOUND, false); me->CastSpell(me->GetVictim(), SPELL_INFECTED_WOUND, false);
@@ -143,7 +143,7 @@ public:
if (me->isAttackReady()) if (me->isAttackReady())
me->SetFacingToObject(me->GetVictim()); me->SetFacingToObject(me->GetVictim());
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -204,7 +204,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -81,7 +81,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -206,7 +206,7 @@ public:
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override
{ {
ClearGossipMenuFor(player); ClearGossipMenuFor(player);
switch(uiAction) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
CloseGossipMenuFor(player); CloseGossipMenuFor(player);
@@ -151,7 +151,7 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch(type) switch (type)
{ {
case DATA_BRONJAHM: case DATA_BRONJAHM:
m_auiEncounter[type] = data; m_auiEncounter[type] = data;
@@ -180,22 +180,22 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case 12752: // Soul Power case 12752: // Soul Power
if( Creature* c = instance->GetCreature(NPC_BronjahmGUID) ) if (Creature* c = instance->GetCreature(NPC_BronjahmGUID))
{ {
std::list<Creature*> L; std::list<Creature*> L;
uint8 count = 0; uint8 count = 0;
c->GetCreaturesWithEntryInRange(L, 200.0f, 36535); // find all Corrupted Soul Fragment (36535) c->GetCreaturesWithEntryInRange(L, 200.0f, 36535); // find all Corrupted Soul Fragment (36535)
for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr ) for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr )
if( (*itr)->IsAlive() ) if ((*itr)->IsAlive())
++count; ++count;
return (count >= 4); return (count >= 4);
} }
break; break;
case 12976: case 12976:
if( Creature* c = instance->GetCreature(NPC_DevourerGUID) ) if (Creature* c = instance->GetCreature(NPC_DevourerGUID))
return (bool)c->AI()->GetData(1); return (bool)c->AI()->GetData(1);
break; break;
} }
@@ -245,7 +245,7 @@ public:
void DoAction(int32 actionId) override void DoAction(int32 actionId) override
{ {
switch(actionId) switch (actionId)
{ {
case ACTION_START_INTRO: case ACTION_START_INTRO:
events.ScheduleEvent(EVENT_START_INTRO, 0ms); events.ScheduleEvent(EVENT_START_INTRO, 0ms);
@@ -1767,7 +1767,7 @@ public:
if (me->IsNonMeleeSpellCast(false, true, true)) if (me->IsNonMeleeSpellCast(false, true, true))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_LK_CHECK_COMBAT: case EVENT_LK_CHECK_COMBAT:
if (me->isActiveObject()) // during fight if (me->isActiveObject()) // during fight
@@ -1953,7 +1953,7 @@ public:
void DoAction(int32 actionId) override void DoAction(int32 actionId) override
{ {
switch(actionId) switch (actionId)
{ {
case ACTION_START_INTRO: case ACTION_START_INTRO:
events.ScheduleEvent(EVENT_LK_SAY_AGGRO, 0ms); events.ScheduleEvent(EVENT_LK_SAY_AGGRO, 0ms);
@@ -2001,7 +2001,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_LK_SAY_AGGRO: case EVENT_LK_SAY_AGGRO:
if (Creature* lkboss = pInstance->instance->GetCreature(pInstance->GetGuidData(NPC_LICH_KING_BOSS))) if (Creature* lkboss = pInstance->instance->GetCreature(pInstance->GetGuidData(NPC_LICH_KING_BOSS)))
@@ -228,7 +228,7 @@ public:
} }
} }
switch(creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_SYLVANAS_PART1: case NPC_SYLVANAS_PART1:
creature->SetVisible(false); creature->SetVisible(false);
@@ -372,7 +372,7 @@ public:
void OnGameObjectCreate(GameObject* go) override void OnGameObjectCreate(GameObject* go) override
{ {
switch(go->GetEntry()) switch (go->GetEntry())
{ {
case GO_FROSTMOURNE: case GO_FROSTMOURNE:
GO_FrostmourneGUID = go->GetGUID(); GO_FrostmourneGUID = go->GetGUID();
@@ -408,7 +408,7 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch(type) switch (type)
{ {
case DATA_INTRO: case DATA_INTRO:
EncounterMask |= (1 << DATA_INTRO); EncounterMask |= (1 << DATA_INTRO);
@@ -597,7 +597,7 @@ public:
if (EncounterMask & (1 << DATA_BATTERED_HILT)) if (EncounterMask & (1 << DATA_BATTERED_HILT))
return; return;
switch(data) switch (data)
{ {
case 1: // talked to leader case 1: // talked to leader
EncounterMask |= (1 << DATA_BATTERED_HILT); EncounterMask |= (1 << DATA_BATTERED_HILT);
@@ -667,7 +667,7 @@ public:
uint32 GetData(uint32 type) const override uint32 GetData(uint32 type) const override
{ {
switch(type) switch (type)
{ {
case DATA_INTRO: case DATA_INTRO:
case DATA_FALRIC: case DATA_FALRIC:
@@ -687,7 +687,7 @@ public:
ObjectGuid GetGuidData(uint32 type) const override ObjectGuid GetGuidData(uint32 type) const override
{ {
switch(type) switch (type)
{ {
case NPC_DARK_RANGER_LORALEN: case NPC_DARK_RANGER_LORALEN:
return NPC_GuardGUID; return NPC_GuardGUID;
@@ -233,7 +233,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -175,7 +175,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED)) if (me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -212,7 +212,7 @@ public:
break; break;
case EVENT_SPECIAL: case EVENT_SPECIAL:
switch(urand(0, 2)) switch (urand(0, 2))
{ {
case 0: // Pursuit case 0: // Pursuit
if (Creature* k = GetKrick()) if (Creature* k = GetKrick())
@@ -305,7 +305,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -150,7 +150,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -261,7 +261,7 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch(type) switch (type)
{ {
case DATA_INSTANCE_PROGRESS: case DATA_INSTANCE_PROGRESS:
if (InstanceProgress < data) if (InstanceProgress < data)
@@ -306,7 +306,7 @@ public:
void SetGuidData(uint32 type, ObjectGuid data) override void SetGuidData(uint32 type, ObjectGuid data) override
{ {
switch(type) switch (type)
{ {
case DATA_NECROLYTE_1_GUID: case DATA_NECROLYTE_1_GUID:
NPC_Necrolyte1GUID = data; NPC_Necrolyte1GUID = data;
@@ -374,7 +374,7 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case 12993: // Doesn't Go to Eleven (4524) case 12993: // Doesn't Go to Eleven (4524)
return bAchievEleven; return bAchievEleven;
@@ -73,7 +73,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -469,7 +469,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -521,7 +521,7 @@ public:
{ {
if (type != POINT_MOTION_TYPE) if (type != POINT_MOTION_TYPE)
return; return;
switch(id) switch (id)
{ {
case 1: case 1:
events.RescheduleEvent(id, 0ms); events.RescheduleEvent(id, 0ms);
@@ -532,7 +532,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1013,7 +1013,7 @@ public:
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1198,7 +1198,7 @@ public:
if (type != WAYPOINT_MOTION_TYPE) if (type != WAYPOINT_MOTION_TYPE)
return; return;
switch(id) switch (id)
{ {
case 0: case 0:
Talk(me->GetEntry() == NPC_JAINA_PART2 ? SAY_JAINA_OUTRO_2 : SAY_SYLVANAS_OUTRO_2); Talk(me->GetEntry() == NPC_JAINA_PART2 ? SAY_JAINA_OUTRO_2 : SAY_SYLVANAS_OUTRO_2);
@@ -1221,7 +1221,7 @@ public:
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -813,7 +813,7 @@ class spell_sindragosa_s_fury : public SpellScript
if (ResistFactor > 0.9f) if (ResistFactor > 0.9f)
ResistFactor = 0.9f; ResistFactor = 0.9f;
uint32 damage = uint32( (GetEffectValue() / _targetCount) * (1.0f - ResistFactor) ); uint32 damage = uint32( (GetEffectValue() / _targetCount) * (1.0f - ResistFactor));
SpellNonMeleeDamage damageInfo(GetCaster(), GetHitUnit(), GetSpellInfo(), GetSpellInfo()->SchoolMask); SpellNonMeleeDamage damageInfo(GetCaster(), GetHitUnit(), GetSpellInfo(), GetSpellInfo()->SchoolMask);
damageInfo.damage = damage; damageInfo.damage = damage;
@@ -157,7 +157,7 @@ public:
void MoveToCorner() void MoveToCorner()
{ {
switch(me->GetEntry()) switch (me->GetEntry())
{ {
case NPC_THANE_KORTHAZZ: case NPC_THANE_KORTHAZZ:
currentWaypoint = 0; currentWaypoint = 0;
@@ -357,7 +357,7 @@ public:
void SummonHelpers(uint32 entry) void SummonHelpers(uint32 entry)
{ {
switch(entry) switch (entry)
{ {
case NPC_LIVING_TRAINEE: case NPC_LIVING_TRAINEE:
me->SummonCreature(NPC_LIVING_TRAINEE, PosSummonLiving[0].GetPositionX(), PosSummonLiving[0].GetPositionY(), PosSummonLiving[0].GetPositionZ(), PosSummonLiving[0].GetOrientation()); me->SummonCreature(NPC_LIVING_TRAINEE, PosSummonLiving[0].GetPositionX(), PosSummonLiving[0].GetPositionY(), PosSummonLiving[0].GetPositionZ(), PosSummonLiving[0].GetOrientation());
@@ -231,7 +231,7 @@ public:
} }
if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_KELTHUZAD_GATE))) if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_KELTHUZAD_GATE)))
{ {
if(!_justSpawned) // Don't open the door if we just spawned and are still doing the conversation if (!_justSpawned) // Don't open the door if we just spawned and are still doing the conversation
{ {
go->SetGoState(GO_STATE_ACTIVE); go->SetGoState(GO_STATE_ACTIVE);
} }
@@ -222,7 +222,7 @@ public:
void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
// Damage done by the controlled Death Knight understudies should also count toward damage done by players // Damage done by the controlled Death Knight understudies should also count toward damage done by players
if(who && who->IsCreature() && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY) if (who && who->IsCreature() && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY)
{ {
me->LowerPlayerDamageReq(damage); me->LowerPlayerDamageReq(damage);
} }
@@ -206,7 +206,7 @@ public:
void OnCreatureCreate(Creature* creature) override void OnCreatureCreate(Creature* creature) override
{ {
switch(creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_PATCHWERK: case NPC_PATCHWERK:
_patchwerkGUID = creature->GetGUID(); _patchwerkGUID = creature->GetGUID();
@@ -277,7 +277,7 @@ public:
return; return;
} }
switch(pGo->GetEntry()) switch (pGo->GetEntry())
{ {
case GO_PATCHWERK_GATE: case GO_PATCHWERK_GATE:
_patchwerkGateGUID = pGo->GetGUID(); _patchwerkGateGUID = pGo->GetGUID();
@@ -621,7 +621,7 @@ public:
void SetData(uint32 id, uint32 data) override void SetData(uint32 id, uint32 data) override
{ {
switch(id) switch (id)
{ {
case DATA_ABOMINATION_KILLED: case DATA_ABOMINATION_KILLED:
abominationsKilled++; abominationsKilled++;
@@ -768,7 +768,7 @@ public:
return false; return false;
// Bosses data // Bosses data
switch(bossId) switch (bossId)
{ {
case BOSS_KELTHUZAD: case BOSS_KELTHUZAD:
if (state == NOT_STARTED) if (state == NOT_STARTED)
@@ -382,7 +382,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -799,7 +799,7 @@ public:
if (!summon) if (!summon)
return; return;
summons.Summon(summon); summons.Summon(summon);
switch(summon->GetEntry()) switch (summon->GetEntry())
{ {
case NPC_ARCANE_OVERLOAD: case NPC_ARCANE_OVERLOAD:
summon->CastSpell(summon, SPELL_ARCANE_OVERLOAD_DMG, true); summon->CastSpell(summon, SPELL_ARCANE_OVERLOAD_DMG, true);
@@ -989,7 +989,7 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
switch(param) switch (param)
{ {
case 1: case 1:
MoveTimer = 1; MoveTimer = 1;
@@ -1123,7 +1123,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1183,7 +1183,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1321,12 +1321,12 @@ public:
void DoAction(int32 param) override void DoAction(int32 param) override
{ {
switch(param) switch (param)
{ {
case 1: // move to next point case 1: // move to next point
if (Vehicle* v = me->GetVehicleKit()) if (Vehicle* v = me->GetVehicleKit())
if (Unit* pass = v->GetPassenger(0)) if (Unit* pass = v->GetPassenger(0))
switch(pass->GetEntry()) switch (pass->GetEntry())
{ {
case NPC_NEXUS_LORD: case NPC_NEXUS_LORD:
{ {
@@ -1357,7 +1357,7 @@ public:
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1397,7 +1397,7 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
events.Update(diff); events.Update(diff);
switch(events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -97,7 +97,7 @@ public:
void OnCreatureCreate(Creature* creature) override void OnCreatureCreate(Creature* creature) override
{ {
switch(creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_MALYGOS: case NPC_MALYGOS:
NPC_MalygosGUID = creature->GetGUID(); NPC_MalygosGUID = creature->GetGUID();
@@ -107,7 +107,7 @@ public:
void OnGameObjectCreate(GameObject* go) override void OnGameObjectCreate(GameObject* go) override
{ {
switch(go->GetEntry()) switch (go->GetEntry())
{ {
case GO_IRIS_N: case GO_IRIS_N:
case GO_IRIS_H: case GO_IRIS_H:
@@ -124,7 +124,7 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch(type) switch (type)
{ {
case DATA_IRIS_ACTIVATED: case DATA_IRIS_ACTIVATED:
if (EncounterStatus == NOT_STARTED) if (EncounterStatus == NOT_STARTED)
@@ -134,7 +134,7 @@ public:
break; break;
case DATA_ENCOUNTER_STATUS: case DATA_ENCOUNTER_STATUS:
EncounterStatus = data; EncounterStatus = data;
switch(data) switch (data)
{ {
case NOT_STARTED: case NOT_STARTED:
bPokeAchiev = false; bPokeAchiev = false;
@@ -184,7 +184,7 @@ public:
ObjectGuid GetGuidData(uint32 type) const override ObjectGuid GetGuidData(uint32 type) const override
{ {
switch(type) switch (type)
{ {
case DATA_MALYGOS_GUID: case DATA_MALYGOS_GUID:
return NPC_MalygosGUID; return NPC_MalygosGUID;
@@ -195,7 +195,7 @@ public:
void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) override void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) override
{ {
switch(eventId) switch (eventId)
{ {
case 20158: case 20158:
if (GameObject* go = instance->GetGameObject(GO_PlatformGUID)) if (GameObject* go = instance->GetGameObject(GO_PlatformGUID))
@@ -233,7 +233,7 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_10: case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_10:
case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_25: case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_25:
@@ -105,9 +105,9 @@ public:
{ {
pInstance->SetData(DATA_DRAKOS, DONE); pInstance->SetData(DATA_DRAKOS, DONE);
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( ObjectGuid guid = pInstance->GetGuidData(DATA_DCD_1 + i) ) if (ObjectGuid guid = pInstance->GetGuidData(DATA_DCD_1 + i))
if( GameObject* pGo = ObjectAccessor::GetGameObject(*me, guid) ) if (GameObject* pGo = ObjectAccessor::GetGameObject(*me, guid))
if( pGo->GetGoState() != GO_STATE_ACTIVE ) if (pGo->GetGoState() != GO_STATE_ACTIVE )
{ {
pGo->SetLootState(GO_READY); pGo->SetLootState(GO_READY);
pGo->UseDoorOrButton(0, false); pGo->UseDoorOrButton(0, false);
@@ -125,17 +125,17 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -206,10 +206,10 @@ public:
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) override
{ {
if( type != POINT_MOTION_TYPE || id != 1 ) if (type != POINT_MOTION_TYPE || id != 1)
return; return;
if( !located ) if (!located)
gonext = true; gonext = true;
} }
@@ -231,21 +231,21 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( timer == 0 ) if (timer == 0)
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true); me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);
timer += diff; timer += diff;
if( timer > 10000 ) if (timer > 10000)
{ {
if( !located ) if (!located)
me->GetMotionMaster()->MoveIdle(); me->GetMotionMaster()->MoveIdle();
located = true; located = true;
me->CastSpell(me, SPELL_UNSTABLE_SPHERE_PULSE, true); me->CastSpell(me, SPELL_UNSTABLE_SPHERE_PULSE, true);
timer -= 2000; timer -= 2000;
} }
if( !located && gonext ) if (!located && gonext)
{ {
PickNewLocation(); PickNewLocation();
gonext = false; gonext = false;
@@ -93,7 +93,7 @@ public:
if (pInstance) if (pInstance)
{ {
pInstance->SetData(DATA_EREGOS, NOT_STARTED); pInstance->SetData(DATA_EREGOS, NOT_STARTED);
if( pInstance->GetData(DATA_UROM) != DONE ) if (pInstance->GetData(DATA_UROM) != DONE )
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
else else
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -110,17 +110,17 @@ public:
{ {
pInstance->SetData(DATA_EREGOS, IN_PROGRESS); pInstance->SetData(DATA_EREGOS, IN_PROGRESS);
if( me->FindNearestCreature(NPC_AMBER_DRAKE, 750.0f, true) ) if (me->FindNearestCreature(NPC_AMBER_DRAKE, 750.0f, true))
pInstance->SetData(DATA_AMBER_VOID, 0); pInstance->SetData(DATA_AMBER_VOID, 0);
else else
pInstance->SetData(DATA_AMBER_VOID, 1); pInstance->SetData(DATA_AMBER_VOID, 1);
if( me->FindNearestCreature(NPC_EMERALD_DRAKE, 750.0f, true) ) if (me->FindNearestCreature(NPC_EMERALD_DRAKE, 750.0f, true))
pInstance->SetData(DATA_EMERALD_VOID, 0); pInstance->SetData(DATA_EMERALD_VOID, 0);
else else
pInstance->SetData(DATA_EMERALD_VOID, 1); pInstance->SetData(DATA_EMERALD_VOID, 1);
if( me->FindNearestCreature(NPC_RUBY_DRAKE, 750.0f, true) ) if (me->FindNearestCreature(NPC_RUBY_DRAKE, 750.0f, true))
pInstance->SetData(DATA_RUBY_VOID, 0); pInstance->SetData(DATA_RUBY_VOID, 0);
else else
pInstance->SetData(DATA_RUBY_VOID, 1); pInstance->SetData(DATA_RUBY_VOID, 1);
@@ -148,10 +148,10 @@ public:
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{ {
if( !me->GetMap()->IsHeroic() ) if (!me->GetMap()->IsHeroic())
return; return;
if( shiftNumber <= uint32(1) && uint32(me->GetHealth() * 100 / me->GetMaxHealth()) <= uint32(60 - shiftNumber * 40) ) if (shiftNumber <= uint32(1) && uint32(me->GetHealth() * 100 / me->GetMaxHealth()) <= uint32(60 - shiftNumber * 40))
{ {
++shiftNumber; ++shiftNumber;
events.RescheduleEvent(EVENT_SPELL_PLANAR_SHIFT, 0ms); events.RescheduleEvent(EVENT_SPELL_PLANAR_SHIFT, 0ms);
@@ -167,7 +167,7 @@ public:
void JustSummoned(Creature* pSummon) override void JustSummoned(Creature* pSummon) override
{ {
if( pSummon->GetEntry() != NPC_LEY_GUARDIAN_WHELP ) if (pSummon->GetEntry() != NPC_LEY_GUARDIAN_WHELP )
return; return;
DoZoneInCombat(pSummon, 300.0f); DoZoneInCombat(pSummon, 300.0f);
@@ -175,25 +175,25 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
if( me->HasAura(SPELL_PLANAR_SHIFT) || me->HasAura(SPELL_DRAKE_STOP_TIME) ) if (me->HasAura(SPELL_PLANAR_SHIFT) || me->HasAura(SPELL_DRAKE_STOP_TIME))
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_SPELL_ARCANE_BARRAGE: case EVENT_SPELL_ARCANE_BARRAGE:
if( Unit* v = me->GetVictim() ) if (Unit* v = me->GetVictim())
me->CastSpell(v, SPELL_ARCANE_BARRAGE, false); me->CastSpell(v, SPELL_ARCANE_BARRAGE, false);
events.Repeat(2500ms); events.Repeat(2500ms);
break; break;
@@ -224,8 +224,8 @@ public:
Talk(SAY_SHIELD); Talk(SAY_SHIELD);
me->CastSpell(me, SPELL_PLANAR_SHIFT, false); me->CastSpell(me, SPELL_PLANAR_SHIFT, false);
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 300.0f, false) ) if (Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 300.0f, false))
if( Creature* pa = me->SummonCreature(NPC_PLANAR_ANOMALY, *me, TEMPSUMMON_TIMED_DESPAWN, 17000) ) if (Creature* pa = me->SummonCreature(NPC_PLANAR_ANOMALY, *me, TEMPSUMMON_TIMED_DESPAWN, 17000))
{ {
pa->SetCanFly(true); pa->SetCanFly(true);
pa->SetDisableGravity(true); pa->SetDisableGravity(true);
@@ -234,7 +234,7 @@ public:
pa->CastSpell(pa, SPELL_PLANAR_AURA_DAMAGE, true); pa->CastSpell(pa, SPELL_PLANAR_AURA_DAMAGE, true);
if (Aura* a = pa->GetAura(SPELL_PLANAR_AURA_DAMAGE)) if (Aura* a = pa->GetAura(SPELL_PLANAR_AURA_DAMAGE))
a->SetDuration(15000); a->SetDuration(15000);
if( pa->AI() ) if (pa->AI())
{ {
pa->AI()->AttackStart(t); pa->AI()->AttackStart(t);
pa->GetMotionMaster()->MoveChase(t, 0.01f); pa->GetMotionMaster()->MoveChase(t, 0.01f);
@@ -125,7 +125,7 @@ public:
if (pInstance) if (pInstance)
{ {
pInstance->SetData(DATA_UROM, NOT_STARTED); pInstance->SetData(DATA_UROM, NOT_STARTED);
if( pInstance->GetData(DATA_VAROS) != DONE ) if (pInstance->GetData(DATA_VAROS) != DONE )
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
else else
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -143,20 +143,20 @@ public:
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
if( lock ) if (lock)
return; return;
uint8 phase = GetPhaseByCurrentPosition(); uint8 phase = GetPhaseByCurrentPosition();
if( phase == 3 ) if (phase == 3)
{ {
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
if( pInstance ) if (pInstance)
pInstance->SetData(DATA_UROM, IN_PROGRESS); pInstance->SetData(DATA_UROM, IN_PROGRESS);
me->SetInCombatWithZone(); me->SetInCombatWithZone();
me->SetHomePosition(cords[0][0], cords[0][1], cords[0][2], cords[0][3]); me->SetHomePosition(cords[0][0], cords[0][1], cords[0][2], cords[0][3]);
if( me->FindCurrentSpellBySpellId(SPELL_EVOCATION) ) if (me->FindCurrentSpellBySpellId(SPELL_EVOCATION))
me->InterruptNonMeleeSpells(false); me->InterruptNonMeleeSpells(false);
events.RescheduleEvent(EVENT_FROSTBOMB, 7s, 11s); events.RescheduleEvent(EVENT_FROSTBOMB, 7s, 11s);
@@ -167,7 +167,7 @@ public:
{ {
lock = true; lock = true;
switch( phase ) switch (phase)
{ {
case 0: case 0:
Talk(SAY_SUMMON_1); Talk(SAY_SUMMON_1);
@@ -190,7 +190,7 @@ public:
void AttackStart(Unit* who) override void AttackStart(Unit* who) override
{ {
if( lock ) if (lock)
return; return;
if (me->GetDistance(1103.0f, 1049.0f, 510.0f) < 55.0f) if (me->GetDistance(1103.0f, 1049.0f, 510.0f) < 55.0f)
@@ -200,8 +200,8 @@ public:
void JustSummoned(Creature* pSummon) override void JustSummoned(Creature* pSummon) override
{ {
pSummon->SetInCombatWithZone(); pSummon->SetInCombatWithZone();
if( Unit* v = pSummon->SelectVictim() ) if (Unit* v = pSummon->SelectVictim())
if( pSummon->AI() ) if (pSummon->AI())
pSummon->AI()->AttackStart(v); pSummon->AI()->AttackStart(v);
} }
@@ -234,7 +234,7 @@ public:
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{ {
switch( spell->Id ) switch (spell->Id)
{ {
case SPELL_SUMMON_MENAGERIE_1: case SPELL_SUMMON_MENAGERIE_1:
{ {
@@ -299,9 +299,9 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( releaseLockTimer ) if (releaseLockTimer)
{ {
if( releaseLockTimer >= 5000 ) if (releaseLockTimer >= 5000)
{ {
lock = false; lock = false;
if (me->IsInCombat()) if (me->IsInCombat())
@@ -315,27 +315,27 @@ public:
releaseLockTimer += diff; releaseLockTimer += diff;
} }
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_FROSTBOMB: case EVENT_FROSTBOMB:
if( Unit* v = me->GetVictim() ) if (Unit* v = me->GetVictim())
me->CastSpell(v, SPELL_FROSTBOMB, false); me->CastSpell(v, SPELL_FROSTBOMB, false);
events.Repeat(7s, 11s); events.Repeat(7s, 11s);
break; break;
case EVENT_TIME_BOMB: case EVENT_TIME_BOMB:
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
DoCast(target, DUNGEON_MODE(SPELL_TIME_BOMB_N, SPELL_TIME_BOMB_H)); DoCast(target, DUNGEON_MODE(SPELL_TIME_BOMB_N, SPELL_TIME_BOMB_H));
events.Repeat(20s, 25s); events.Repeat(20s, 25s);
break; break;
@@ -100,7 +100,7 @@ public:
if (pInstance) if (pInstance)
{ {
pInstance->SetData(DATA_VAROS, NOT_STARTED); pInstance->SetData(DATA_VAROS, NOT_STARTED);
if( pInstance->GetData(DATA_CC_COUNT) < 10 ) if (pInstance->GetData(DATA_CC_COUNT) < 10 )
{ {
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
me->CastSpell(me, 50053, true); me->CastSpell(me, 50053, true);
@@ -157,23 +157,23 @@ public:
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if( !UpdateVictim() ) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) ) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
case EVENT_AMPLIFY_MAGIC: case EVENT_AMPLIFY_MAGIC:
{ {
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_AMPLIFY_MAGIC, false); me->CastSpell(target, SPELL_AMPLIFY_MAGIC, false);
events.Repeat(17s + 500ms, 22s + 500ms); events.Repeat(17s + 500ms, 22s + 500ms);
} }
@@ -185,7 +185,7 @@ public:
{ {
Talk(SAY_AZURE); Talk(SAY_AZURE);
Talk(SAY_AZURE_EMOTE); Talk(SAY_AZURE_EMOTE);
switch( events.ExecuteEvent() ) switch (events.ExecuteEvent())
{ {
case EVENT_CALL_AZURE_RING_CAPTAIN_1: case EVENT_CALL_AZURE_RING_CAPTAIN_1:
me->CastSpell(me, SPELL_CALL_AZURE_RING_CAPTAIN_1, true); me->CastSpell(me, SPELL_CALL_AZURE_RING_CAPTAIN_1, true);
@@ -204,11 +204,11 @@ public:
events.ScheduleEvent(EVENT_CALL_AZURE_RING_CAPTAIN_1, 16s); events.ScheduleEvent(EVENT_CALL_AZURE_RING_CAPTAIN_1, 16s);
break; break;
} }
if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
{ {
if( Creature* trigger = me->SummonCreature(NPC_ARCANE_BEAM, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 13000) ) if (Creature* trigger = me->SummonCreature(NPC_ARCANE_BEAM, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 13000))
{ {
if( Creature* c = me->FindNearestCreature(NPC_AZURE_RING_CAPTAIN, 500.0f, true) ) if (Creature* c = me->FindNearestCreature(NPC_AZURE_RING_CAPTAIN, 500.0f, true))
c->CastSpell(trigger, SPELL_ARCANE_BEAM_VISUAL, true); c->CastSpell(trigger, SPELL_ARCANE_BEAM_VISUAL, true);
trigger->GetMotionMaster()->MoveChase(target, 0.1f); trigger->GetMotionMaster()->MoveChase(target, 0.1f);
trigger->CastSpell(me, SPELL_ARCANE_BEAM_PERIODIC_DAMAGE, true); trigger->CastSpell(me, SPELL_ARCANE_BEAM_PERIODIC_DAMAGE, true);
@@ -234,7 +234,7 @@ public:
me->SetControlled(true, UNIT_STATE_ROOT); me->SetControlled(true, UNIT_STATE_ROOT);
me->CastSpell((Unit*)nullptr, SPELL_ENERGIZE_CORES, false); me->CastSpell((Unit*)nullptr, SPELL_ENERGIZE_CORES, false);
ZapAngle += M_PI / 2; ZapAngle += M_PI / 2;
if( ZapAngle >= 2 * M_PI ) if (ZapAngle >= 2 * M_PI)
ZapAngle -= 2 * M_PI; ZapAngle -= 2 * M_PI;
events.ScheduleEvent(EVENT_ENERGIZE_CORES_THIN, 2s); events.ScheduleEvent(EVENT_ENERGIZE_CORES_THIN, 2s);
} }
@@ -63,7 +63,7 @@ public:
void OnCreatureCreate(Creature* pCreature) override void OnCreatureCreate(Creature* pCreature) override
{ {
switch( pCreature->GetEntry() ) switch (pCreature->GetEntry())
{ {
case NPC_DRAKOS: case NPC_DRAKOS:
uiDrakosGUID = pCreature->GetGUID(); uiDrakosGUID = pCreature->GetGUID();
@@ -82,19 +82,19 @@ public:
void OnGameObjectCreate(GameObject* pGo) override void OnGameObjectCreate(GameObject* pGo) override
{ {
switch( pGo->GetEntry() ) switch (pGo->GetEntry())
{ {
case GO_DRAGON_CAGE_DOOR: case GO_DRAGON_CAGE_DOOR:
for( uint8 i = 0; i < 3; ++i ) for( uint8 i = 0; i < 3; ++i )
{ {
if( DragonCageDoorGUID[i] ) if (DragonCageDoorGUID[i])
continue; continue;
DragonCageDoorGUID[i] = pGo->GetGUID(); DragonCageDoorGUID[i] = pGo->GetGUID();
break; break;
} }
if( m_auiEncounter[DATA_DRAKOS] == DONE ) if (m_auiEncounter[DATA_DRAKOS] == DONE)
if( pGo->GetGoState() != GO_STATE_ACTIVE ) if (pGo->GetGoState() != GO_STATE_ACTIVE )
{ {
pGo->SetLootState(GO_READY); pGo->SetLootState(GO_READY);
pGo->UseDoorOrButton(0, false); pGo->UseDoorOrButton(0, false);
@@ -129,11 +129,11 @@ public:
void SetData(uint32 type, uint32 data) override void SetData(uint32 type, uint32 data) override
{ {
switch( type ) switch (type)
{ {
case DATA_DRAKOS: case DATA_DRAKOS:
m_auiEncounter[DATA_DRAKOS] = data; m_auiEncounter[DATA_DRAKOS] = data;
if( data == DONE ) if (data == DONE)
{ {
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1);
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount); DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount);
@@ -144,18 +144,18 @@ public:
break; break;
case DATA_VAROS: case DATA_VAROS:
m_auiEncounter[DATA_VAROS] = data; m_auiEncounter[DATA_VAROS] = data;
if( data == DONE ) if (data == DONE)
{ {
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0);
if( Creature* urom = instance->GetCreature(uiUromGUID) ) if (Creature* urom = instance->GetCreature(uiUromGUID))
urom->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); urom->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
} }
break; break;
case DATA_UROM: case DATA_UROM:
m_auiEncounter[DATA_UROM] = data; m_auiEncounter[DATA_UROM] = data;
if( data == DONE ) if (data == DONE)
if( Creature* eregos = instance->GetCreature(uiEregosGUID) ) if (Creature* eregos = instance->GetCreature(uiEregosGUID))
eregos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); eregos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
break; break;
case DATA_EREGOS: case DATA_EREGOS:
@@ -174,13 +174,13 @@ public:
} }
break; break;
case DATA_CC_COUNT: case DATA_CC_COUNT:
if( CentrifugeCount < 10 ) if (CentrifugeCount < 10)
{ {
++CentrifugeCount; ++CentrifugeCount;
DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount); DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount);
} }
if( CentrifugeCount >= 10 ) if (CentrifugeCount >= 10)
if( Creature* varos = instance->GetCreature(uiVarosGUID) ) if (Creature* varos = instance->GetCreature(uiVarosGUID))
{ {
varos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); varos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
varos->InterruptNonMeleeSpells(false); varos->InterruptNonMeleeSpells(false);
@@ -198,13 +198,13 @@ public:
break; break;
} }
if( data == DONE ) if (data == DONE)
SaveToDB(); SaveToDB();
} }
uint32 GetData(uint32 type) const override uint32 GetData(uint32 type) const override
{ {
switch( type ) switch (type)
{ {
case DATA_DRAKOS: case DATA_DRAKOS:
case DATA_VAROS: case DATA_VAROS:
@@ -220,7 +220,7 @@ public:
ObjectGuid GetGuidData(uint32 identifier) const override ObjectGuid GetGuidData(uint32 identifier) const override
{ {
switch( identifier ) switch (identifier)
{ {
case DATA_DRAKOS: case DATA_DRAKOS:
return uiDrakosGUID; return uiDrakosGUID;
@@ -259,24 +259,24 @@ public:
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{ {
switch(criteria_id) switch (criteria_id)
{ {
case CRITERIA_EXPERIENCED_AMBER: case CRITERIA_EXPERIENCED_AMBER:
if( source ) if (source)
if( Unit* drake = source->GetVehicleBase() ) if (Unit* drake = source->GetVehicleBase())
if( drake->GetEntry() == NPC_AMBER_DRAKE ) if (drake->GetEntry() == NPC_AMBER_DRAKE )
return true; return true;
break; break;
case CRITERIA_EXPERIENCED_EMERALD: case CRITERIA_EXPERIENCED_EMERALD:
if( source ) if (source)
if( Unit* drake = source->GetVehicleBase() ) if (Unit* drake = source->GetVehicleBase())
if( drake->GetEntry() == NPC_EMERALD_DRAKE ) if (drake->GetEntry() == NPC_EMERALD_DRAKE )
return true; return true;
break; break;
case CRITERIA_EXPERIENCED_RUBY: case CRITERIA_EXPERIENCED_RUBY:
if( source ) if (source)
if( Unit* drake = source->GetVehicleBase() ) if (Unit* drake = source->GetVehicleBase())
if( drake->GetEntry() == NPC_RUBY_DRAKE ) if (drake->GetEntry() == NPC_RUBY_DRAKE )
return true; return true;
break; break;
case CRITERIA_AMBER_VOID: case CRITERIA_AMBER_VOID:
@@ -157,7 +157,7 @@ public:
return; return;
} }
if(me->GetEntry() == NPC_BELGARISTRASZ) if (me->GetEntry() == NPC_BELGARISTRASZ)
{ {
Talk(SAY_BELGARISTRASZ); Talk(SAY_BELGARISTRASZ);
} }
@@ -167,10 +167,10 @@ public:
bool OnGossipHello(Player* player, Creature* creature) override bool OnGossipHello(Player* player, Creature* creature) override
{ {
if(creature->IsQuestGiver()) if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
if(creature->GetInstanceScript()->GetData(DATA_DRAKOS) == DONE) if (creature->GetInstanceScript()->GetData(DATA_DRAKOS) == DONE)
{ {
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
@@ -251,10 +251,10 @@ public:
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override
{ {
ClearGossipMenuFor(player); ClearGossipMenuFor(player);
switch(creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_VERDISA: case NPC_VERDISA:
switch(uiAction) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
SendGossipMenuFor(player, GOSSIP_TEXTID_VERDISA2, creature->GetGUID()); SendGossipMenuFor(player, GOSSIP_TEXTID_VERDISA2, creature->GetGUID());
@@ -273,7 +273,7 @@ public:
CloseGossipMenuFor(player); CloseGossipMenuFor(player);
break; break;
case NPC_BELGARISTRASZ: case NPC_BELGARISTRASZ:
switch(uiAction) switch (uiAction)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
openedMenu[player->GetGUID()] = true; openedMenu[player->GetGUID()] = true;
@@ -415,11 +415,11 @@ public:
void SpellHitTarget(Unit* target, SpellInfo const* spell) override void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{ {
for( uint8 i = 0; i < 8; ++i ) for( uint8 i = 0; i < 8; ++i )
if( me->m_spells[i] == spell->Id ) if (me->m_spells[i] == spell->Id)
{ {
if( target && target->IsAlive() && !target->CanFly() && target->IsHostileTo(me) && !spell->IsTargetingArea()) if (target && target->IsAlive() && !target->CanFly() && target->IsHostileTo(me) && !spell->IsTargetingArea())
{ {
if( Unit* charmer = me->GetCharmer() ) if (Unit* charmer = me->GetCharmer())
Unit::Kill(charmer, charmer, false); Unit::Kill(charmer, charmer, false);
} }
break; break;
@@ -143,7 +143,7 @@ public:
{ {
if (hp) if (hp)
{ {
switch(HealthCheck) switch (HealthCheck)
{ {
case 75: case 75:
Talk(SAY_75HEALTH); Talk(SAY_75HEALTH);

Some files were not shown because too many files have changed in this diff Show More