diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-13 19:35:01 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-13 19:35:01 +0200 |
| commit | 87d9d1d7055fdda84d8f116041224ce0fb289b02 (patch) | |
| tree | 3534098d09befbb23c39cbf02a3256365d5bfc76 /src/server/scripts/Northrend | |
| parent | 0bebf40fe7fc6ffdf3e86452f14e3bf647380b15 (diff) | |
| parent | 1c9a3d562120039c9fe96d35a63ade8ee9cb1266 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/Spells/spell_pet.cpp
src/server/scripts/Spells/spell_shaman.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
121 files changed, 670 insertions, 529 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 82ac2e8387c..692f4c2d25c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,8 +123,8 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); - if (!player || !player->isAlive()) + Player* player = i->GetSource(); + if (!player || !player->IsAlive()) continue; // Summon clone if (Unit* summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) @@ -144,7 +144,7 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); + Player* player = i->GetSource(); player->RemoveAurasDueToSpell(GetSpellForPhaseMask(player->GetPhaseMask())); } } @@ -245,7 +245,7 @@ public: { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { if (player->HasAura(spell)) { @@ -277,13 +277,13 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->getVictim(), SPELL_MIND_FLAY); + DoCast(me->GetVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 20*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; if (uiShadowBoltVolleyTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT_VOLLEY); uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; } else uiShadowBoltVolleyTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index e8b17224179..f2bdf829494 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -178,12 +178,12 @@ public: if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround) return; - if (!me->getVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) { - if (!me->getVictim()) + if (!me->GetVictim()) { who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH); AttackStart(who); @@ -216,8 +216,8 @@ public: if (UpdateVictim()) { - AttackStart(me->getVictim()); - me->GetMotionMaster()->MoveChase(me->getVictim()); + AttackStart(me->GetVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } else { @@ -228,7 +228,7 @@ public: if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS) EnterCombat(target); } - else if (!me->isInCombat()) + else if (!me->IsInCombat()) EnterEvadeMode(); } } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index a68cbcb7ee6..5b65d049dd3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -184,7 +184,7 @@ public: Talk(SAY_FEED); me->GetMotionMaster()->Clear(); me->SetSpeed(MOVE_WALK, 1.0f, true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); Phase = FEEDING; uiPhaseTimer = 20*IN_MILLISECONDS; break; @@ -219,7 +219,7 @@ public: { target = Unit::GetUnit(*me, (*itr)->getUnitGuid()); // exclude pets & totems - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) target_list.push_back(target); target = NULL; } @@ -247,7 +247,7 @@ public: { Unit* pEmbraceTarget = GetEmbraceTarget(); - if (Phase == FEEDING && pEmbraceTarget && pEmbraceTarget->isAlive()) + if (Phase == FEEDING && pEmbraceTarget && pEmbraceTarget->IsAlive()) { uiEmbraceTakenDamage += damage; if (uiEmbraceTakenDamage > (uint32) DUNGEON_MODE(DATA_EMBRACE_DMG, H_DATA_EMBRACE_DMG)) @@ -397,7 +397,7 @@ public: return true; Creature* pPrinceTaldaram = Unit::GetCreature(*go, instance->GetData64(DATA_PRINCE_TALDARAM)); - if (pPrinceTaldaram && pPrinceTaldaram->isAlive()) + if (pPrinceTaldaram && pPrinceTaldaram->IsAlive()) { // maybe these are hacks :( go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 26a4aeeca01..13c0a6a3b59 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -179,7 +179,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (cr && cr->isAlive()) + if (cr && cr->IsAlive()) vInitiands.push_back(*itr); } if (vInitiands.empty()) @@ -212,7 +212,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (cr && cr->isAlive()) + if (cr && cr->IsAlive()) { cr->SetVisible(false); cr->setDeathState(JUST_DIED); @@ -267,7 +267,7 @@ public: for (std::set<uint64>::const_iterator itr = InitiandGUIDs.begin(); itr != InitiandGUIDs.end(); ++itr) { Creature* cr = instance->GetCreature(*itr); - if (!cr || (cr && cr->isAlive())) + if (!cr || (cr && cr->IsAlive())) return 0; } return 1; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 1ec61488c1b..21666f69c9e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -217,7 +217,7 @@ public: { if (Creature* Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Guardian->AddThreat(me->getVictim(), 0.0f); + Guardian->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Guardian); } } @@ -234,7 +234,7 @@ public: { if (Creature* Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Venomancer->AddThreat(me->getVictim(), 0.0f); + Venomancer->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Venomancer); } } @@ -253,7 +253,7 @@ public: { if (Creature* Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { - Datter->AddThreat(me->getVictim(), 0.0f); + Datter->AddThreat(me->GetVictim(), 0.0f); DoZoneInCombat(Datter); } } @@ -300,7 +300,7 @@ public: if (Channeling == true) { for (uint8 i = 0; i < 8; ++i) - DoCast(me->getVictim(), SPELL_SUMMON_CARRION_BEETLES, true); + DoCast(me->GetVictim(), SPELL_SUMMON_CARRION_BEETLES, true); Channeling = false; } else if (CarrionBeetlesTimer <= diff) @@ -318,7 +318,7 @@ public: if (PoundTimer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (Creature* pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, SPELL_POUND, false); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index eec7959f56f..384ecb06670 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit* Victim) { // not sure if this aura check is correct, I think it is though - if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->isAlive()) + if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->IsAlive()) return; me->ModifyHealth(int32(me->CountPctFromMaxHealth(10))); @@ -115,7 +115,7 @@ public: void CheckDistance(float dist, const uint32 uiDiff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; float x=0.0f, y=0.0f, z=0.0f; @@ -128,7 +128,7 @@ public: uiCheckDistanceTimer -= uiDiff; return; } - if (me->IsInEvadeMode() || !me->getVictim()) + if (me->IsInEvadeMode() || !me->GetVictim()) return; if (me->GetDistance(x, y, z) > dist) EnterEvadeMode(); @@ -153,7 +153,7 @@ public: if (uiPierceTimer <= diff) { - DoCast(me->getVictim(), SPELL_PIERCE_ARMOR); + DoCast(me->GetVictim(), SPELL_PIERCE_ARMOR); uiPierceTimer = 8*IN_MILLISECONDS; } else uiPierceTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 295f38658e2..2177027d177 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -151,7 +151,7 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->getVictim(), SPELL_MIND_FLAY); + DoCast(me->GetVictim(), SPELL_MIND_FLAY); uiMindFlayTimer = 15*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; @@ -211,7 +211,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->getVictim(), SPELL_ACID_SPLASH, true); + DoCast(me->GetVictim(), SPELL_ACID_SPLASH, true); } }; @@ -257,7 +257,7 @@ public: if (uiBackstabTimer <= diff) { - DoCast(me->getVictim(), SPELL_BACKSTAB); + DoCast(me->GetVictim(), SPELL_BACKSTAB); uiBackstabTimer = 12*IN_MILLISECONDS; } else uiBackstabTimer -= diff; @@ -304,7 +304,7 @@ public: if (uiShadowNovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true); + DoCast(me->GetVictim(), SPELL_SHADOW_NOVA, true); uiShadowNovaTimer = 17*IN_MILLISECONDS; } else uiShadowNovaTimer -= diff; @@ -343,13 +343,13 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STRIKE, true); + DoCast(me->GetVictim(), SPELL_STRIKE, true); uiStrikeTimer = 15*IN_MILLISECONDS; } else uiStrikeTimer -= diff; if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE, true); + DoCast(me->GetVictim(), SPELL_CLEAVE, true); uiCleaveTimer = 17*IN_MILLISECONDS; } else uiCleaveTimer -= diff; @@ -400,7 +400,7 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; @@ -448,13 +448,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 11*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiBindingWebsTimer <= diff) { - DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true); + DoCast(me->GetVictim(), SPELL_BLINDING_WEBS, true); uiBindingWebsTimer = 17*IN_MILLISECONDS; } else uiBindingWebsTimer -= diff; @@ -503,13 +503,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiPoisonSprayTimer <= diff) { - DoCast(me->getVictim(), SPELL_POSION_SPRAY, true); + DoCast(me->GetVictim(), SPELL_POSION_SPRAY, true); uiPoisonSprayTimer = 17*IN_MILLISECONDS; } else uiPoisonSprayTimer -= diff; @@ -544,7 +544,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript for (uint8 n = 0; n < 3; ++n) { Watcher[n] = ObjectAccessor::GetCreature(*target, instance->GetData64(DATA_WATCHER_GASHRA + n)); - if (Watcher[n] && !Watcher[n]->isAlive()) + if (Watcher[n] && !Watcher[n]->IsAlive()) return false; } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index bbec79ea43d..2b1cc2590ca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -290,7 +290,7 @@ public: if (pTenebron) { pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); - if (pTenebron->isAlive()) + if (pTenebron->IsAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -308,7 +308,7 @@ public: if (pShadron) { pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); - if (pShadron->isAlive()) + if (pShadron->IsAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -326,7 +326,7 @@ public: if (pVesperon) { pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); - if (pVesperon->isAlive()) + if (pVesperon->IsAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -371,11 +371,11 @@ public: Creature* pTenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)); Creature* pShadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)); Creature* pVesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)); - if (pTenebron && pTenebron->isAlive()) + if (pTenebron && pTenebron->IsAlive()) pTenebron->DisappearAndDie(); - if (pShadron && pShadron->isAlive()) + if (pShadron && pShadron->IsAlive()) pShadron->DisappearAndDie(); - if (pVesperon && pVesperon->isAlive()) + if (pVesperon && pVesperon->IsAlive()) pVesperon->DisappearAndDie(); instance->SetData(TYPE_SARTHARION_EVENT, DONE); @@ -422,10 +422,10 @@ public: //if at least one of the dragons are alive and are being called bool bCanUseWill = false; - if (pFetchTene && pFetchTene->isAlive() && !pFetchTene->getVictim()) + if (pFetchTene && pFetchTene->IsAlive() && !pFetchTene->GetVictim()) { bCanUseWill = true; - if (!pFetchTene->isInCombat()) + if (!pFetchTene->IsInCombat()) { DoCast(me, SPELL_POWER_OF_TENEBRON); AddDrakeLootMode(); @@ -437,10 +437,10 @@ public: pFetchTene->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - if (pFetchShad && pFetchShad->isAlive() && !pFetchShad->getVictim()) + if (pFetchShad && pFetchShad->IsAlive() && !pFetchShad->GetVictim()) { bCanUseWill = true; - if (!pFetchShad->isInCombat()) + if (!pFetchShad->IsInCombat()) { DoCast(me, SPELL_POWER_OF_SHADRON); AddDrakeLootMode(); @@ -452,10 +452,10 @@ public: pFetchShad->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - if (pFetchVesp && pFetchVesp->isAlive() && !pFetchVesp->getVictim()) + if (pFetchVesp && pFetchVesp->IsAlive() && !pFetchVesp->GetVictim()) { bCanUseWill = true; - if (!pFetchVesp->isInCombat()) + if (!pFetchVesp->IsInCombat()) { DoCast(me, SPELL_POWER_OF_VESPERON); AddDrakeLootMode(); @@ -477,7 +477,7 @@ public: { if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(uiDataId))) { - if (temp->isAlive() && !temp->getVictim()) + if (temp->IsAlive() && !temp->GetVictim()) { if (temp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING)) temp->SetWalk(false); @@ -521,8 +521,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource() && i->getSource()->isAlive()) - Talk(WHISPER_LAVA_CHURN, i->getSource()->GetGUID()); + if (i->GetSource() && i->GetSource()->IsAlive()) + Talk(WHISPER_LAVA_CHURN, i->GetSource()->GetGUID()); } } @@ -559,7 +559,7 @@ public: //spell will target dragons, if they are still alive at 35% if (!m_bIsBerserk && !HealthAbovePct(35) - && ((pTene && pTene->isAlive()) || (pShad && pShad->isAlive()) || (pVesp && pVesp->isAlive()))) + && ((pTene && pTene->IsAlive()) || (pShad && pShad->IsAlive()) || (pVesp && pVesp->IsAlive()))) { Talk(SAY_SARTHARION_BERSERK); DoCast(me, SPELL_BERSERK); @@ -620,7 +620,7 @@ public: if (m_uiFlameBreathTimer <= uiDiff) { Talk(SAY_SARTHARION_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); m_uiFlameBreathTimer = urand(25000, 35000); } else @@ -629,7 +629,7 @@ public: // Tail Sweep if (m_uiTailSweepTimer <= uiDiff) { - DoCast(me->getVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); m_uiTailSweepTimer = urand(15000, 20000); } else @@ -638,7 +638,7 @@ public: // Cleave if (m_uiCleaveTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); m_uiCleaveTimer = urand(7000, 10000); } else @@ -818,7 +818,7 @@ struct dummy_dragonAI : public ScriptedAI if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - Talk(iTextId, i->getSource()->GetGUID()); + Talk(iTextId, i->GetSource()->GetGUID()); } } } @@ -946,7 +946,7 @@ struct dummy_dragonAI : public ScriptedAI // Twilight Revenge to main boss if (Unit* pSartharion = Unit::GetUnit(*me, instance->GetData64(DATA_SARTHARION))) - if (pSartharion->isAlive()) + if (pSartharion->IsAlive()) { pSartharion->RemoveAurasDueToSpell(uiSpellId); DoCast(pSartharion, SPELL_TWILIGHT_REVENGE, true); @@ -1050,7 +1050,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_TENEBRON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1154,7 +1154,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_SHADRON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1238,7 +1238,7 @@ public: else { OpenPortal(); - DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); + DoCast(me->GetVictim(), SPELL_TWILIGHT_TORMENT_VESP); m_uiAcolyteVesperonTimer = urand(60000, 70000); } } @@ -1249,7 +1249,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_VESPERON_BREATH); - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1330,24 +1330,24 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } } } //not solo fight, so main boss has deduff pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SARTHARION)); - if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR)) + if (pDebuffTarget && pDebuffTarget->IsAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR); //event not in progress, then solo fight and must remove debuff mini-boss pDebuffTarget = instance->instance->GetCreature(instance->GetData64(DATA_SHADRON)); - if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA)) + if (pDebuffTarget && pDebuffTarget->IsAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA)) pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA); } } @@ -1416,7 +1416,7 @@ public: if (pVesperon) (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; - if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) + if (pVesperon && pVesperon->IsAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); Map* map = me->GetMap(); @@ -1429,15 +1429,15 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->getVictim()) - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->GetSource()->GetVictim()) + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } @@ -1627,8 +1627,8 @@ public: { DoCastAOE(RAID_MODE(SPELL_VOID_BLAST, SPELL_VOID_BLAST_H)); ////twilight realm - //DoCast(me->getVictim(), 57620, true); - //DoCast(me->getVictim(), 57874, true); + //DoCast(me->GetVictim(), 57620, true); + //DoCast(me->GetVictim(), 57874, true); VoidBlast_Timer = 9000; me->RemoveAllAuras(); me->Kill(me); @@ -1677,7 +1677,7 @@ public: // twilight torment if (m_uiFadeArmorTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_FADE_ARMOR); + DoCast(me->GetVictim(), SPELL_FADE_ARMOR); m_uiFadeArmorTimer = urand(5000, 10000); } else diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 9a61b83dbce..0018722e01f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -351,11 +351,11 @@ class boss_halion : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TWILIGHT_HALION))) - if (twilightHalion->isAlive()) + if (twilightHalion->IsAlive()) twilightHalion->Kill(twilightHalion); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) - if (controller->isAlive()) + if (controller->IsAlive()) controller->Kill(controller); } @@ -509,12 +509,12 @@ class boss_twilight_halion : public CreatureScript if (me->IsDamageEnoughForLootingAndReward()) halion->LowerPlayerDamageReq(halion->GetMaxHealth()); - if (halion->isAlive()) + if (halion->IsAlive()) killer->Kill(halion); } if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) - if (controller->isAlive()) + if (controller->IsAlive()) controller->Kill(controller); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); @@ -684,10 +684,10 @@ class npc_halion_controller : public CreatureScript void UpdateAI(uint32 diff) { - // The isInCombat() check is needed because that check should be false when Halion is + // The IsInCombat() check is needed because that check should be false when Halion is // not engaged, while it would return true without as UpdateVictim() checks for // combat state. - if (!(_events.IsInPhase(PHASE_INTRO)) && me->isInCombat() && !UpdateVictim()) + if (!(_events.IsInPhase(PHASE_INTRO)) && me->IsInCombat() && !UpdateVictim()) { EnterEvadeMode(); return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index d391abb0d4d..bdb0dc6209b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -118,7 +118,7 @@ class boss_saviana_ragefire : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_AGGRESSIVE); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); break; case POINT_TAKEOFF: events.ScheduleEvent(EVENT_AIR_MOVEMENT, 1); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index cd5efa56840..ca7e9915ec5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -192,7 +192,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) { DoCast(target, SPELL_HAMMER_JUSTICE); DoCast(target, SPELL_HAMMER_RIGHTEOUS); @@ -267,7 +267,7 @@ public: bDone = false; if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) + if (pMemory->IsAlive()) pMemory->RemoveFromWorld(); } @@ -314,7 +314,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) @@ -327,7 +327,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) @@ -349,7 +349,7 @@ public: break; case 1: if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) + if (pMemory->IsAlive()) DoCast(pMemory, SPELL_RENEW); break; } @@ -412,7 +412,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_OLD_WOUNDS); } uiOldWoundsTimer = 12000; @@ -428,7 +428,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; @@ -441,7 +441,7 @@ public: { if (TempSummon* summ = me->ToTempSummon()) if (Unit* summoner = summ->GetSummoner()) - if (summoner->isAlive()) + if (summoner->IsAlive()) summoner->GetAI()->SetData(1, 0); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index b253d15773d..c47e7ad1fa4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -150,7 +150,7 @@ public: void JustSummoned(Creature* summon) { SummonList.push_back(summon->GetGUID()); - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); } void UpdateAI(uint32 uiDiff) @@ -200,7 +200,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_DEATH_RESPITE); } uiDeathRespiteTimer = urand(15000, 16000); @@ -228,7 +228,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_DESECRATION); } uiDesecration = urand(15000, 16000); @@ -255,7 +255,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); @@ -329,7 +329,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, (SPELL_LEAP)); } uiAttackTimer = 3500; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 5cc8f517533..e74d420a741 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -102,12 +102,12 @@ void AggroAllPlayers(Creature* temp) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC); temp->SetReactState(REACT_AGGRESSIVE); @@ -255,8 +255,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 1.0f); @@ -282,8 +282,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) { pPassenger->CastSpell(player, SPELL_SHIELD_BREAKER, true); break; @@ -396,8 +396,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 5.0f); @@ -525,7 +525,7 @@ public: if (uiFireBallTimer <= uiDiff) { - if (me->getVictim()) + if (me->GetVictim()) DoCastVictim(SPELL_FIREBALL); uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; @@ -851,8 +851,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) { DoCast(player, SPELL_MULTI_SHOT); break; @@ -967,7 +967,7 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_EVISCERATE); + DoCast(me->GetVictim(), SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 2cd4c7a9ee4..aa9314b84ee 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -108,7 +108,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 9d0bb450a73..1d785001f72 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -391,12 +391,12 @@ public: for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) { temp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 9c6d481c207..30f02ced9a0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -446,7 +446,7 @@ class mob_swarm_scarab : public CreatureScript _determinationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); DoCast(me, SPELL_ACID_MANDIBLE); me->SetInCombatWithZone(); - if (me->isInCombat()) + if (me->IsInCombat()) if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK))) Anubarak->AI()->JustSummoned(me); } @@ -520,7 +520,7 @@ class mob_nerubian_burrower : public CreatureScript DoCast(me, SPELL_SPIDER_FRENZY); DoCast(me, SPELL_AWAKENED); me->SetInCombatWithZone(); - if (me->isInCombat()) + if (me->IsInCombat()) if (Creature* Anubarak = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK))) Anubarak->AI()->JustSummoned(me); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index f1bf0579187..c8cab5e6c98 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -632,7 +632,7 @@ struct boss_faction_championsAI : public BossAI uint32 TeamInInstance = 0; if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); if (instance) @@ -1484,7 +1484,7 @@ class mob_toc_hunter : public CreatureScript events.ScheduleEvent(EVENT_STEADY_SHOT, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); return; case EVENT_WING_CLIP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->GetDistance2d(target) < 6.0f) DoCast(target, SPELL_WING_CLIP); @@ -1673,7 +1673,7 @@ class mob_toc_warrior : public CreatureScript events.ScheduleEvent(EVENT_SUNDER_ARMOR, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS)); return; case EVENT_SHATTERING_THROW: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (target->HasAuraWithMechanic(1 << MECHANIC_IMMUNE_SHIELD)) { @@ -1752,7 +1752,7 @@ class mob_toc_dk : public CreatureScript events.ScheduleEvent(EVENT_DEATH_COIL, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); return; case EVENT_DEATH_GRIP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->IsInRange(target, 5.0f, 30.0f, false)) { @@ -1871,7 +1871,7 @@ class mob_toc_rogue : public CreatureScript events.RescheduleEvent(EVENT_BLADE_FLURRY, 5*IN_MILLISECONDS); return; case EVENT_SHADOWSTEP: - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { if (me->IsInRange(target, 10.0f, 40.0f, false)) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index c39b8403474..21c3c983c64 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -353,7 +353,7 @@ class mob_snobold_vassal : public CreatureScript void JustDied(Unit* /*killer*/) { if (Unit* target = Unit::GetPlayer(*me, _targetGUID)) - if (target->isAlive()) + if (target->IsAlive()) target->RemoveAurasDueToSpell(SPELL_SNOBOLLED); if (_instance) _instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); @@ -381,12 +381,12 @@ class mob_snobold_vassal : public CreatureScript if (Unit* target = Unit::GetPlayer(*me, _targetGUID)) { - if (!target->isAlive()) + if (!target->IsAlive()) { if (_instance) { Unit* gormok = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_GORMOK)); - if (gormok && gormok->isAlive()) + if (gormok && gormok->IsAlive()) { SetCombatMovement(false); _targetDied = true; @@ -521,7 +521,7 @@ struct boss_jormungarAI : public BossAI { if (Creature* otherWorm = Unit::GetCreature(*me, instance->GetData64(OtherWormEntry))) { - if (!otherWorm->isAlive()) + if (!otherWorm->IsAlive()) { instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_DONE); @@ -663,7 +663,7 @@ struct boss_jormungarAI : public BossAI { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); SetCombatMovement(true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->SetDisplayId(ModelMobile); events.SetPhase(PHASE_MOBILE); events.ScheduleEvent(EVENT_SUBMERGE, 45*IN_MILLISECONDS, 0, PHASE_MOBILE); @@ -1089,9 +1089,9 @@ class boss_icehowl : public CreatureScript Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { - if (Unit* player = itr->getSource()) + if (Unit* player = itr->GetSource()) { - if (player->isAlive() && player->IsWithinDistInMap(me, 6.0f)) + if (player->IsAlive() && player->IsWithinDistInMap(me, 6.0f)) { DoCastAOE(SPELL_TRAMPLE); events.ScheduleEvent(EVENT_TRAMPLE, 4*IN_MILLISECONDS); @@ -1117,8 +1117,8 @@ class boss_icehowl : public CreatureScript SetCombatMovement(true); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); - AttackStart(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); + AttackStart(me->GetVictim()); events.ScheduleEvent(EVENT_MASSIVE_CRASH, 40*IN_MILLISECONDS); events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS)); _stage = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index b41e986741b..fe2897295ce 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -231,7 +231,7 @@ struct boss_twin_baseAI : public BossAI { if (Creature* pSister = GetSister()) { - if (!pSister->isAlive()) + if (!pSister->IsAlive()) { me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); pSister->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 1f461c8c285..40febbd530a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -286,7 +286,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript state = DONE; break; case DONE: - if (instance->GetPlayers().getFirst()->getSource()->GetTeam() == ALLIANCE) + if (instance->GetPlayers().getFirst()->GetSource()->GetTeam() == ALLIANCE) EventStage = 4020; else EventStage = 4030; @@ -375,7 +375,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript // decrease attempt counter at wipe Map::PlayerList const &PlayerList = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter); // if theres no more attemps allowed diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 090ebbca69d..179f248d316 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -135,7 +135,7 @@ class npc_announcer_toc10 : public CreatureScript char const* _message = "We are ready!"; - if (player->isInCombat() || instance->IsEncounterInProgress() || instance->GetData(TYPE_EVENT)) + if (player->IsInCombat() || instance->IsEncounterInProgress() || instance->GetData(TYPE_EVENT)) return true; uint8 i = 0; @@ -208,7 +208,7 @@ class npc_announcer_toc10 : public CreatureScript creature->CastSpell(creature, SPELL_DESTROY_FLOOR_KNOCKUP, false); Creature* anubArak = Unit::GetCreature(*creature, instance->GetData64(NPC_ANUBARAK)); - if (!anubArak || !anubArak->isAlive()) + if (!anubArak || !anubArak->IsAlive()) anubArak = creature->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); instance->SetBossState(BOSS_ANUBARAK, NOT_STARTED); @@ -332,7 +332,7 @@ class boss_lich_king_toc : public CreatureScript { _instance->SetBossState(BOSS_LICH_KING, DONE); Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)); - if (!temp || !temp->isAlive()) + if (!temp || !temp->IsAlive()) temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); _instance->SetData(TYPE_EVENT, 0); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 0ca7ccd196a..873a359b549 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -234,7 +234,7 @@ public: Map::PlayerList const &PlayerList = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->DeMorph(); DoCast(me, SPELL_ACHIEVEMENT_CHECK); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 516a3e0f7c9..b6f6d7fcb23 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -155,7 +155,7 @@ class boss_bronjahm : public CreatureScript events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000)); break; case EVENT_SHADOW_BOLT: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_SHADOW_BOLT); events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index c3158acf67d..4c99138ed3f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -338,7 +338,7 @@ class boss_devourer_of_souls : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); me->SetDisplayId(DISPLAY_ANGER); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000)); } break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index efc687eb409..1073c29b667 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -163,7 +163,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (creature->GetEntry() == NPC_JAINA_PART1) @@ -300,7 +300,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (creature->GetEntry() == NPC_JAINA_PART1) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 5014f78c9a3..03f67765406 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -47,7 +47,7 @@ class instance_forge_of_souls : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) teamInInstance = player->GetTeam(); switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index a64f2cf5467..abdd5db9d6f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -887,7 +887,7 @@ public: events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); break; case EVENT_DEADLY_POISON: - DoCast(me->getVictim(), SPELL_DEADLY_POISON); + DoCast(me->GetVictim(), SPELL_DEADLY_POISON); events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); break; case EVENT_ENVENOMED_DAGGER_THROW: @@ -896,7 +896,7 @@ public: events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); break; case EVENT_KIDNEY_SHOT: - DoCast(me->getVictim(), SPELL_KIDNEY_SHOT); + DoCast(me->GetVictim(), SPELL_KIDNEY_SHOT); events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000); break; } @@ -942,11 +942,11 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPECTRAL_STRIKE: - DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); + DoCast(me->GetVictim(), SPELL_SPECTRAL_STRIKE); events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); break; case EVENT_SHIELD_BASH: - DoCast(me->getVictim(), SPELL_SHIELD_BASH); + DoCast(me->GetVictim(), SPELL_SHIELD_BASH); events.ScheduleEvent(EVENT_SHIELD_BASH, 5000); break; case EVENT_TORTURED_ENRAGE: @@ -1209,7 +1209,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_INTRO_EVENT) == NOT_STARTED) @@ -1230,7 +1230,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_WAVE_COUNT)) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index bff18b508d5..b23eb8d6ab8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -101,7 +101,7 @@ public: { Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); switch (creature->GetEntry()) @@ -271,11 +271,11 @@ public: for (std::set<uint64>::const_iterator itr = waveGuidList[waveId].begin(); itr != waveGuidList[waveId].end(); ++itr) { Creature* npc = instance->GetCreature(*itr); - if (!npc || !npc->isAlive()) + if (!npc || !npc->IsAlive()) ++deadNpcs; } - // because the current npc returns isAlive when OnUnitDeath happens + // because the current npc returns IsAlive when OnUnitDeath happens // we check if the number of dead npcs is equal to the list-1 if (deadNpcs == waveGuidList[waveId].size() - 1) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 822adbb9201..3a2af8a98d1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -232,7 +232,7 @@ enum Events events.ScheduleEvent(EVENT_CHILLING_WAVE, 5000, 0, PHASE_TWO); else if (events.IsInPhase(PHASE_THREE)) events.ScheduleEvent(EVENT_DEEP_FREEZE, 10000, 0, PHASE_THREE); - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); break; default: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 31a1e94357e..6df01aae7b9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -205,10 +205,10 @@ class boss_ick : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; - if (!me->getVictim() && me->getThreatManager().isThreatListEmpty()) + if (!me->GetVictim() && me->getThreatManager().isThreatListEmpty()) { EnterEvadeMode(); return; @@ -530,7 +530,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader { Map::PlayerList const &players = caster->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->IsWithinDist(caster, 60.0f)) // don't know correct range caster->CastSpell(player, SPELL_EXPLOSIVE_BARRAGE_SUMMON, true); } @@ -570,7 +570,7 @@ class spell_ick_explosive_barrage : public SpellScriptLoader if (caster->GetTypeId() == TYPEID_UNIT) { caster->GetMotionMaster()->Clear(); - caster->GetMotionMaster()->MoveChase(caster->getVictim()); + caster->GetMotionMaster()->MoveChase(caster->GetVictim()); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index c335c90cc30..195a974a8d3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -397,8 +397,8 @@ class player_overlord_brandAI : public PlayerAI void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) - if (tyrannus->getVictim()) - me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->getVictim(), true, NULL, NULL, tyrannus->GetGUID()); + if (tyrannus->GetVictim()) + me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->GetVictim(), true, NULL, NULL, tyrannus->GetGUID()); } void HealDone(Unit* /*target*/, uint32& addHealth) @@ -505,7 +505,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster() || !instance) + if (player->IsGameMaster() || !instance) return false; if (instance->GetBossState(DATA_TYRANNUS) != IN_PROGRESS && instance->GetBossState(DATA_TYRANNUS) != DONE) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index fa2805bdb4c..1abdf2acd60 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -65,7 +65,7 @@ class instance_pit_of_saron : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 1ec29224763..b0befe98404 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -166,8 +166,8 @@ class boss_drakkari_colossus : public CreatureScript me->SetInCombatWithZone(); - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim(), 0, 0); break; } @@ -223,7 +223,7 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + DoCast(me->GetVictim(), SPELL_MIGHTY_BLOW); events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } @@ -474,13 +474,13 @@ public: if (mojoWaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_MOJO_WAVE); + DoCast(me->GetVictim(), SPELL_MOJO_WAVE); mojoWaveTimer = 15*IN_MILLISECONDS; } else mojoWaveTimer -= diff; if (mojoPuddleTimer <= diff) { - DoCast(me->getVictim(), SPELL_MOJO_PUDDLE); + DoCast(me->GetVictim(), SPELL_MOJO_PUDDLE); mojoPuddleTimer = 18*IN_MILLISECONDS; } else mojoPuddleTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index df949c7a962..14dcfb9e932 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -83,13 +83,13 @@ public: if (uiBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_ECK_BITE); + DoCast(me->GetVictim(), SPELL_ECK_BITE); uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { - DoCast(me->getVictim(), SPELL_ECK_SPIT); + DoCast(me->GetVictim(), SPELL_ECK_SPIT); uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index e4cdf89c165..8318a916afe 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -171,7 +171,7 @@ public: if (uiWhirlingSlashTimer <= diff) { - DoCast(me->getVictim(), SPELL_WHIRLING_SLASH); + DoCast(me->GetVictim(), SPELL_WHIRLING_SLASH); uiWhirlingSlashTimer = 21*IN_MILLISECONDS; ++uiPhaseCounter; } else uiWhirlingSlashTimer -= diff; @@ -207,19 +207,19 @@ public: { if (uiPunctureTimer <= diff) { - DoCast(me->getVictim(), SPELL_PUNCTURE); + DoCast(me->GetVictim(), SPELL_PUNCTURE); uiPunctureTimer = 8*IN_MILLISECONDS; } else uiPunctureTimer -= diff; if (uiEnrageTimer <= diff) { - DoCast(me->getVictim(), SPELL_ENRAGE); + DoCast(me->GetVictim(), SPELL_ENRAGE); uiEnrageTimer = 20*IN_MILLISECONDS; } else uiEnrageTimer -= diff; if (uiStompTimer <= diff) { - DoCast(me->getVictim(), SPELL_STOMP); + DoCast(me->GetVictim(), SPELL_STOMP); uiStompTimer = 20*IN_MILLISECONDS; } else uiStompTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 97c75b5f391..e1743bd0ade 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -107,27 +107,27 @@ public: { Talk(SAY_QUAKE); if (bPhase) - DoCast(me->getVictim(), SPELL_QUAKE, true); + DoCast(me->GetVictim(), SPELL_QUAKE, true); else - DoCast(me->getVictim(), SPELL_GROUND_TREMOR, true); + DoCast(me->GetVictim(), SPELL_GROUND_TREMOR, true); uiGroundTremorTimer = 10*IN_MILLISECONDS; } else uiGroundTremorTimer -= uiDiff; if (uiNumblingShoutTimer <= uiDiff) { if (bPhase) - DoCast(me->getVictim(), SPELL_NUMBING_ROAR, true); + DoCast(me->GetVictim(), SPELL_NUMBING_ROAR, true); else - DoCast(me->getVictim(), SPELL_NUMBING_SHOUT, true); + DoCast(me->GetVictim(), SPELL_NUMBING_SHOUT, true); uiNumblingShoutTimer = 10*IN_MILLISECONDS; } else uiNumblingShoutTimer -=uiDiff; if (uiDeterminedStabTimer <= uiDiff) { if (bPhase) - DoCast(me->getVictim(), SPELL_DETERMINED_GORE); + DoCast(me->GetVictim(), SPELL_DETERMINED_GORE); else - DoCast(me->getVictim(), SPELL_DETERMINED_STAB, true); + DoCast(me->GetVictim(), SPELL_DETERMINED_STAB, true); uiDeterminedStabTimer = 8*IN_MILLISECONDS; } else uiDeterminedStabTimer -=uiDiff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 6deb0c20676..38e3a9621f6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -130,20 +130,20 @@ public: if (uiPoisonNovaTimer <= diff) { - DoCast(me->getVictim(), SPELL_POISON_NOVA); + DoCast(me->GetVictim(), SPELL_POISON_NOVA); Talk(EMOTE_NOVA); uiPoisonNovaTimer = 15*IN_MILLISECONDS; } else uiPoisonNovaTimer -= diff; if (uiPowerfullBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_POWERFULL_BITE); + DoCast(me->GetVictim(), SPELL_POWERFULL_BITE); uiPowerfullBiteTimer = 10*IN_MILLISECONDS; } else uiPowerfullBiteTimer -= diff; if (uiVenomBoltTimer <= diff) { - DoCast(me->getVictim(), SPELL_VENOM_BOLT); + DoCast(me->GetVictim(), SPELL_VENOM_BOLT); uiVenomBoltTimer = 10*IN_MILLISECONDS; } else uiVenomBoltTimer -= diff; @@ -238,7 +238,7 @@ public: if (uiGripOfSladRanTimer <= diff) { - Unit* target = me->getVictim(); + Unit* target = me->GetVictim(); DoCast(target, SPELL_GRIP_OF_SLAD_RAN); uiGripOfSladRanTimer = urand(3, 6)*IN_MILLISECONDS; @@ -293,7 +293,7 @@ public: if (uiVenomousBiteTimer <= diff) { - DoCast(me->getVictim(), SPELL_VENOMOUS_BITE); + DoCast(me->GetVictim(), SPELL_VENOMOUS_BITE); uiVenomousBiteTimer = 10*IN_MILLISECONDS; } else uiVenomousBiteTimer -= diff; } diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index d17198b0c92..ddd26fe6bc2 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -162,7 +162,7 @@ public: eckTheFerociousGUID = creature->GetGUID(); break; case CREATURE_RUIN_DWELLER: - if (creature->isAlive()) + if (creature->IsAlive()) DwellerGUIDs.insert(creature->GetGUID()); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 833649b576d..86e455fedc8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -899,7 +899,7 @@ class boss_prince_valanar_icc : public CreatureScript break; } summons.Summon(summon); - if (me->isInCombat()) + if (me->IsInCombat()) DoZoneInCombat(summon); } @@ -1336,7 +1336,7 @@ class npc_dark_nucleus : public CreatureScript if (_targetAuraCheck <= diff) { _targetAuraCheck = 1000; - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { if (me->GetDistance(victim) < 15.0f && !victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID())) @@ -1345,7 +1345,7 @@ class npc_dark_nucleus : public CreatureScript me->ClearUnitState(UNIT_STATE_CASTING); } else - MoveInLineOfSight(me->getVictim()); + MoveInLineOfSight(me->GetVictim()); } } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 4fbfe4219d4..40c164533ee 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -368,7 +368,7 @@ class boss_blood_queen_lana_thel : public CreatureScript case EVENT_BLOOD_MIRROR: { // victim can be NULL when this is processed in the same update tick as EVENT_AIR_PHASE - if (me->getVictim()) + if (me->GetVictim()) { Player* newOfftank = SelectRandomTarget(true); if (_offtank != newOfftank) @@ -377,8 +377,8 @@ class boss_blood_queen_lana_thel : public CreatureScript if (_offtank) { // both spells have SPELL_ATTR5_SINGLE_TARGET_SPELL, no manual removal needed - _offtank->CastSpell(me->getVictim(), SPELL_BLOOD_MIRROR_DAMAGE, true); - me->getVictim()->CastSpell(_offtank, SPELL_BLOOD_MIRROR_DUMMY, true); + _offtank->CastSpell(me->GetVictim(), SPELL_BLOOD_MIRROR_DAMAGE, true); + me->GetVictim()->CastSpell(_offtank, SPELL_BLOOD_MIRROR_DUMMY, true); DoCastVictim(SPELL_BLOOD_MIRROR_VISUAL); if (Is25ManRaid() && _offtank->GetQuestStatus(QUEST_BLOOD_INFUSION) == QUEST_STATUS_INCOMPLETE && _offtank->HasAura(SPELL_UNSATED_CRAVING) && !_offtank->HasAura(SPELL_THIRST_QUENCHED) && @@ -476,7 +476,7 @@ class boss_blood_queen_lana_thel : public CreatureScript for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) if (Unit* refTarget = (*itr)->getTarget()) - if (refTarget != me->getVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank || (refTarget != _offtank))) + if (refTarget != me->GetVictim() && refTarget->GetTypeId() == TYPEID_PLAYER && (includeOfftank || (refTarget != _offtank))) tempTargets.push_back(refTarget->ToPlayer()); if (tempTargets.empty()) @@ -490,7 +490,7 @@ class boss_blood_queen_lana_thel : public CreatureScript if (includeOfftank) { - tempTargets.sort(Trinity::ObjectDistanceOrderPred(me->getVictim())); + tempTargets.sort(Trinity::ObjectDistanceOrderPred(me->GetVictim())); return tempTargets.front(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index f01c28766f9..08a14c3d700 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -1274,7 +1274,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - targets.remove(GetCaster()->getVictim()); + targets.remove(GetCaster()->GetVictim()); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 4ec945fcb77..998e87ce015 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -331,7 +331,7 @@ class npc_stinky_icc : public CreatureScript void JustDied(Unit* /*killer*/) { if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT))) - if (festergut->isAlive()) + if (festergut->IsAlive()) festergut->AI()->Talk(SAY_STINKY_DEAD); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index a78f25bd394..f0586c74444 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -300,7 +300,7 @@ class boss_lady_deathwhisper : public CreatureScript // Full House achievement for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr) if (Unit* unit = ObjectAccessor::GetUnit(*me, *itr)) - if (unit->isAlive() && unit->GetEntry() != NPC_VENGEFUL_SHADE) + if (unit->IsAlive() && unit->GetEntry() != NPC_VENGEFUL_SHADE) livingAddEntries.insert(unit->GetEntry()); if (livingAddEntries.size() >= 5) @@ -308,7 +308,7 @@ class boss_lady_deathwhisper : public CreatureScript if (Creature* darnavan = ObjectAccessor::GetCreature(*me, _darnavanGUID)) { - if (darnavan->isAlive()) + if (darnavan->IsAlive()) { darnavan->setFaction(35); darnavan->CombatStop(true); @@ -321,7 +321,7 @@ class boss_lady_deathwhisper : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->KilledMonsterCredit(NPC_DARNAVAN_CREDIT, 0); } else @@ -359,7 +359,7 @@ class boss_lady_deathwhisper : public CreatureScript { Talk(SAY_PHASE_2); Talk(EMOTE_PHASE_2); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); damage -= me->GetPower(POWER_MANA); me->SetPower(POWER_MANA, 0); me->RemoveAurasDueToSpell(SPELL_MANA_BARRIER); @@ -595,7 +595,7 @@ class boss_lady_deathwhisper : public CreatureScript std::list<Creature*> temp; for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr) if (Creature* cre = ObjectAccessor::GetCreature(*me, *itr)) - if (cre->isAlive() && (cre->GetEntry() == NPC_CULT_FANATIC || cre->GetEntry() == NPC_CULT_ADHERENT)) + if (cre->IsAlive() && (cre->GetEntry() == NPC_CULT_FANATIC || cre->GetEntry() == NPC_CULT_ADHERENT)) temp.push_back(cre); // noone to empower @@ -858,7 +858,7 @@ class npc_darnavan : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->FailQuest(QUEST_DEPROGRAMMING); } else @@ -889,7 +889,7 @@ class npc_darnavan : public CreatureScript if (me->HasUnitState(UNIT_STATE_CASTING)) return; - if (_canShatter && me->getVictim() && me->getVictim()->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL)) + if (_canShatter && me->GetVictim() && me->GetVictim()->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL)) { DoCastVictim(SPELL_SHATTERING_THROW); _canShatter = false; @@ -897,7 +897,7 @@ class npc_darnavan : public CreatureScript return; } - if (_canCharge && !me->IsWithinMeleeRange(me->getVictim())) + if (_canCharge && !me->IsWithinMeleeRange(me->GetVictim())) { DoCastVictim(SPELL_CHARGE); _canCharge = false; @@ -992,7 +992,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader void HandleEffect(SpellEffIndex /*effIndex*/) { - if (GetCaster()->isSummon()) + if (GetCaster()->IsSummon()) if (Unit* owner = GetCaster()->ToTempSummon()->GetSummoner()) owner->GetAI()->SetGUID(GetCaster()->GetGUID(), GUID_CULTIST); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 7d508b154eb..8fa4e030243 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -245,7 +245,7 @@ class boss_lord_marrowgar : public CreatureScript case EVENT_BONE_STORM_END: if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); me->SetSpeed(MOVE_RUN, _baseSpeed, true); events.CancelEvent(EVENT_BONE_STORM_MOVE); events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10000); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index cab02c9ca75..6441497a4f6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -337,7 +337,7 @@ class boss_professor_putricide : public CreatureScript break; } - if (me->isInCombat()) + if (me->IsInCombat()) DoZoneInCombat(summon); } @@ -624,7 +624,7 @@ class boss_professor_putricide : public CreatureScript break; case EVENT_RESUME_ATTACK: me->SetReactState(REACT_DEFENSIVE); - AttackStart(me->getVictim()); + AttackStart(me->GetVictim()); // remove Tear Gas me->RemoveAurasDueToSpell(SPELL_TEAR_GAS_PERIODIC_TRIGGER); instance->DoRemoveAurasDueToSpellOnPlayers(71615); @@ -1312,7 +1312,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader if (!professor) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; - if (professor->AI()->GetData(DATA_PHASE) == PHASE_COMBAT_3 || !professor->isAlive()) + if (professor->AI()->GetData(DATA_PHASE) == PHASE_COMBAT_3 || !professor->IsAlive()) { extendedError = SPELL_CUSTOM_ERROR_ALL_POTIONS_USED; return SPELL_FAILED_CUSTOM_ERROR; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index f398ad55603..688febe41dd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -373,7 +373,7 @@ class npc_precious_icc : public CreatureScript { _summons.DespawnAll(); if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) - if (rotface->isAlive()) + if (rotface->IsAlive()) rotface->AI()->Talk(SAY_PRECIOUS_DIES); } @@ -546,7 +546,7 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitUnit()->isAlive())) + if (!(GetHitCreature() && GetHitUnit()->IsAlive())) return; GetCaster()->RemoveAurasDueToSpell(SPELL_LITTLE_OOZE_COMBINE); @@ -578,7 +578,7 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitCreature()->isAlive())) + if (!(GetHitCreature() && GetHitCreature()->IsAlive())) return; if (Aura* unstable = GetCaster()->GetAura(SPELL_UNSTABLE_OOZE)) @@ -620,7 +620,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - if (!(GetHitCreature() && GetHitCreature()->isAlive())) + if (!(GetHitCreature() && GetHitCreature()->IsAlive())) return; if (Aura* unstable = GetCaster()->GetAura(SPELL_UNSTABLE_OOZE)) @@ -635,7 +635,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader GetCaster()->RemoveAurasDueToSpell(SPELL_LARGE_OOZE_COMBINE); if (InstanceScript* instance = GetCaster()->GetInstanceScript()) if (Creature* rotface = Unit::GetCreature(*GetCaster(), instance->GetData64(DATA_ROTFACE))) - if (rotface->isAlive()) + if (rotface->IsAlive()) { rotface->AI()->Talk(EMOTE_UNSTABLE_EXPLOSION); rotface->AI()->Talk(SAY_UNSTABLE_EXPLOSION); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 7294e4a5571..53e8b6d8110 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1043,7 +1043,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader { PreventHitDefaultEffect(effIndex); - if (!GetHitUnit()->isAlive() || !_targetCount) + if (!GetHitUnit()->IsAlive() || !_targetCount) return; float resistance = float(GetHitUnit()->GetResistance(SpellSchoolMask(GetSpellInfo()->SchoolMask))); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 65da2226a74..42fe279ce87 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -361,7 +361,7 @@ class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> bool operator()(Unit* unit) const { - if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->isTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) + if (!unit || unit == _sourceObj || !unit->isTargetableForAttack() || unit->IsTotem() || unit->HasAura(SPELL_PLAGUE_AVOIDANCE)) return false; if ((_notAura1 && unit->HasAura(_notAura1)) || (_notAura2 && unit->HasAura(_notAura2))) return false; @@ -762,7 +762,7 @@ class boss_the_lich_king : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) { - if (spell->Id == SPELL_HARVESTED_SOUL && me->isInCombat() && !IsHeroic()) + if (spell->Id == SPELL_HARVESTED_SOUL && me->IsInCombat() && !IsHeroic()) Talk(SAY_LK_FROSTMOURNE_KILL); } @@ -1124,7 +1124,7 @@ class boss_the_lich_king : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_THE_FROZEN_THRONE) player->GetSession()->SendPacket(data); } @@ -1736,7 +1736,7 @@ class npc_terenas_menethil : public CreatureScript void EnterEvadeMode() { // no running back home - if (!me->isAlive()) + if (!me->IsAlive()) return; me->DeleteThreatList(); @@ -1827,7 +1827,7 @@ class npc_terenas_menethil : public CreatureScript } // fighting Spirit Warden - if (me->isInCombat()) + if (me->IsInCombat()) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 259f2c28300..cf200530726 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -155,8 +155,8 @@ class RisenArchmageCheck // look for all permanently spawned Risen Archmages that are not yet in combat bool operator()(Creature* creature) { - return creature->isAlive() && creature->GetEntry() == NPC_RISEN_ARCHMAGE && - creature->GetDBTableGUIDLow() && !creature->isInCombat(); + return creature->IsAlive() && creature->GetEntry() == NPC_RISEN_ARCHMAGE && + creature->GetDBTableGUIDLow() && !creature->IsInCombat(); } }; @@ -547,7 +547,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript void UpdateAI(uint32 /*diff*/) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; std::list<HostileReference*> const& threatList = me->getThreatManager().getThreatList(); @@ -736,7 +736,7 @@ class npc_risen_archmage : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) if (me->GetDBTableGUIDLow()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) DoCast(me, SPELL_CORRUPTION); @@ -820,7 +820,7 @@ class npc_blazing_skeleton : public CreatureScript switch (eventId) { case EVENT_FIREBALL: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_FIREBALL); _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000)); break; @@ -896,7 +896,7 @@ class npc_suppresser : public CreatureScript } // this creature has REACT_PASSIVE so it does not always have victim here - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) if (victim->GetEntry() != NPC_VALITHRIA_DREAMWALKER) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 3ffa6a0c4be..aab1e5354d1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -292,7 +292,7 @@ class FrostwingVrykulSearcher bool operator()(Unit* unit) { - if (!unit->isAlive()) + if (!unit->IsAlive()) return false; switch (unit->GetEntry()) @@ -756,7 +756,7 @@ class boss_sister_svalna : public CreatureScript { if (Creature* crusader = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CAPTAIN_ARNATH + i))) { - if (crusader->isAlive() && crusader->GetEntry() == crusader->GetCreatureData()->id) + if (crusader->IsAlive() && crusader->GetEntry() == crusader->GetCreatureData()->id) { crusader->m_Events.AddEvent(new CaptainSurviveTalk(*crusader), crusader->m_Events.CalculateTime(delay)); delay += 6000; @@ -960,7 +960,7 @@ class npc_crok_scourgebane : public CreatureScript { if (action == ACTION_START_GAUNTLET) { - if (_isEventDone || !me->isAlive()) + if (_isEventDone || !me->IsAlive()) return; _isEventActive = true; @@ -1807,7 +1807,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader wards.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); for (std::list<Creature*>::iterator itr = wards.begin(); itr != wards.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->HasAura(SPELL_STONEFORM)) + if ((*itr)->IsAlive() && (*itr)->HasAura(SPELL_STONEFORM)) { (*itr)->AI()->Talk(SAY_TRAP_ACTIVATE); (*itr)->RemoveAurasDueToSpell(SPELL_STONEFORM); @@ -1954,7 +1954,7 @@ class AliveCheck bool operator()(WorldObject* object) const { if (Unit* unit = object->ToUnit()) - return unit->isAlive(); + return unit->IsAlive(); return true; } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index c528b8413af..c7996c830a3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -59,7 +59,7 @@ class icecrown_citadel_teleport : public GameObjectScript if (!spell) return false; - if (player->isInCombat()) + if (player->IsInCombat()) { Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT); return true; @@ -79,7 +79,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) { - if (player->isInCombat()) + if (player->IsInCombat()) { if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(FROZEN_THRONE_TELEPORT)) Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index db4ab2f32d2..99af60d7bea 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -172,7 +172,7 @@ class instance_icecrown_citadel : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 421dabf48ac..a1695ee245d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -138,7 +138,7 @@ public: BossAI::SummonedCreatureDespawn(summon); // check if it is an actual killed guard - if (!me->isAlive() || summon->isAlive() || summon->GetEntry() != MOB_CRYPT_GUARD) + if (!me->IsAlive() || summon->IsAlive() || summon->GetEntry() != MOB_CRYPT_GUARD) return; summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 9013b051b9a..c34843494ba 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -166,16 +166,16 @@ public: { if (instance->GetBossState(BOSS_HORSEMEN) != NOT_STARTED) { - if (!Thane->isAlive()) + if (!Thane->IsAlive()) Thane->Respawn(); - if (!Lady->isAlive()) + if (!Lady->IsAlive()) Lady->Respawn(); - if (!Baron->isAlive()) + if (!Baron->IsAlive()) Baron->Respawn(); - if (!Sir->isAlive()) + if (!Sir->IsAlive()) Sir->Respawn(); CAST_AI(boss_four_horsemen::boss_four_horsemenAI, Thane->AI())->encounterActionReset = true; @@ -191,7 +191,7 @@ public: } if (checkAllDead) - return !Thane->isAlive() && !Lady->isAlive() && !Baron->isAlive() && !Sir->isAlive(); + return !Thane->IsAlive() && !Lady->IsAlive() && !Baron->IsAlive() && !Sir->IsAlive(); } return false; } @@ -256,9 +256,9 @@ public: // switch to "who" if nearer than current target. void SelectNearestTarget(Unit* who) { - if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->IsValidAttackTarget(who)) + if (me->GetVictim() && me->GetDistanceOrder(who, me->GetVictim()) && me->IsValidAttackTarget(who)) { - me->getThreatManager().modifyThreatPercent(me->getVictim(), -100); + me->getThreatManager().modifyThreatPercent(me->GetVictim(), -100); me->AddThreat(who, 1000000.0f); } } @@ -362,7 +362,7 @@ public: DoCast(target, SPELL_PRIMARY(id)); } else - DoCast(me->getVictim(), SPELL_PRIMARY(id)); + DoCast(me->GetVictim(), SPELL_PRIMARY(id)); events.ScheduleEvent(EVENT_CAST, 15000); break; @@ -385,7 +385,7 @@ public: if (!caster) DoMeleeAttackIfReady(); - else if ((!DoSpellAttackIfReady(SPELL_SECONDARY(id)) || !me->IsWithinLOSInMap(me->getVictim())) && movementCompleted && !doDelayPunish) + else if ((!DoSpellAttackIfReady(SPELL_SECONDARY(id)) || !me->IsWithinLOSInMap(me->GetVictim())) && movementCompleted && !doDelayPunish) doDelayPunish = true; } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 86ea9ce929a..53e02f639ad 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -105,7 +105,7 @@ public: switch (eventId) { case EVENT_WOUND: - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); events.ScheduleEvent(EVENT_WOUND, 10000); break; case EVENT_ENRAGE: @@ -130,11 +130,11 @@ public: } } - if (me->getVictim() && me->getVictim()->GetEntry() == MOB_ZOMBIE) + if (me->GetVictim() && me->GetVictim()->GetEntry() == MOB_ZOMBIE) { - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - me->Kill(me->getVictim()); + me->Kill(me->GetVictim()); me->ModifyHealth(int32(me->CountPctFromMaxHealth(5))); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 2ce913e56fd..1138e3a463f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -324,19 +324,19 @@ class boss_gothik : public CreatureScript bool checkdead = false; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() <= POS_Y_GATE && - i->getSource()->GetPositionY() >= POS_Y_EAST) + if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() <= POS_Y_GATE && + i->GetSource()->GetPositionY() >= POS_Y_EAST) { checklife = true; } - else if (i->getSource() && i->getSource()->isAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() >= POS_Y_GATE && - i->getSource()->GetPositionY() <= POS_Y_WEST) + else if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() >= POS_Y_GATE && + i->GetSource()->GetPositionY() <= POS_Y_WEST) { checkdead = true; } @@ -359,7 +359,7 @@ class boss_gothik : public CreatureScript case SPELL_INFORM_LIVE_KNIGHT: spellId = SPELL_INFORM_DEAD_KNIGHT; break; case SPELL_INFORM_LIVE_RIDER: spellId = SPELL_INFORM_DEAD_RIDER; break; } - if (spellId && me->isInCombat()) + if (spellId && me->IsInCombat()) { me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST); if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) @@ -375,7 +375,7 @@ class boss_gothik : public CreatureScript void SpellHitTarget(Unit* target, SpellInfo const* spell) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; switch (spell->Id) @@ -464,11 +464,11 @@ class boss_gothik : public CreatureScript } break; case EVENT_BOLT: - DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); events.ScheduleEvent(EVENT_BOLT, 1000); break; case EVENT_HARVEST: - DoCast(me->getVictim(), SPELL_HARVEST_SOUL, true); + DoCast(me->GetVictim(), SPELL_HARVEST_SOUL, true); events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: @@ -537,7 +537,7 @@ class mob_gothik_minion : public CreatureScript void JustDied(Unit* /*killer*/) { - if (me->isSummon()) + if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) CombatAI::JustDied(owner); } @@ -561,9 +561,9 @@ class mob_gothik_minion : public CreatureScript { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->isAlive() && isOnSameSide(i->getSource())) + if (i->GetSource() && i->GetSource()->IsAlive() && isOnSameSide(i->GetSource())) { - AttackStart(i->getSource()); + AttackStart(i->GetSource()); return; } } @@ -576,7 +576,7 @@ class mob_gothik_minion : public CreatureScript void UpdateAI(uint32 diff) { - if (gateClose && (!isOnSameSide(me) || (me->getVictim() && !isOnSameSide(me->getVictim())))) + if (gateClose && (!isOnSameSide(me) || (me->GetVictim() && !isOnSameSide(me->GetVictim())))) { EnterEvadeMode(); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 61640f1d225..7515321a3f6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -117,7 +117,7 @@ public: events.ScheduleEvent(EVENT_FEVER, urand(15000, 20000)); events.ScheduleEvent(EVENT_PHASE, 90000); events.ScheduleEvent(EVENT_ERUPT, 15000); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } else { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9b5b26dd4f5..f7a7f233c8c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -252,7 +252,7 @@ struct NotCharmedTargetSelector : public std::unary_function<Unit*, bool> bool operator()(Unit const* target) const { - return !target->isCharmed(); + return !target->IsCharmed(); } }; @@ -431,7 +431,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); events.ScheduleEvent(EVENT_BOLT, urand(5000, 10000)); events.ScheduleEvent(EVENT_NOVA, 15000); events.ScheduleEvent(EVENT_DETONATE, urand(30000, 40000)); @@ -504,7 +504,7 @@ public: for (uint8 i = 1; i <= count; i++) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); - if (target && !target->isCharmed() && (chained.find(target->GetGUID()) == chained.end())) + if (target && !target->IsCharmed() && (chained.find(target->GetGUID()) == chained.end())) { DoCast(target, SPELL_CHAINS_OF_KELTHUZAD); float scale = target->GetFloatValue(OBJECT_FIELD_SCALE_X); @@ -525,7 +525,7 @@ public: { if (Unit* player = Unit::GetPlayer(*me, (*itr).first)) { - if (!player->isCharmed()) + if (!player->IsCharmed()) { player->SetObjectScale((*itr).second); std::map<uint64, float>::iterator next = itr; @@ -660,7 +660,7 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { - if (player->isGameMaster()) + if (player->IsGameMaster()) return false; InstanceScript* instance = player->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f1b2d9aeaed..c124051cc0b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -126,7 +126,7 @@ public: events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 13a5340fa8e..cdc7de912da 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -119,7 +119,7 @@ public: for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit* target = (*i)->getTarget(); - if (target->isAlive() && target != me->getVictim() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) + if (target->IsAlive() && target != me->GetVictim() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) { MostHP = target->GetHealth(); pMostHPTarget = target; @@ -127,7 +127,7 @@ public: } if (!pMostHPTarget) - pMostHPTarget = me->getVictim(); + pMostHPTarget = me->GetVictim(); DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE, H_SPELL_HATEFUL_STRIKE), true); @@ -140,7 +140,7 @@ public: events.ScheduleEvent(EVENT_SLIME, 2000); break; case EVENT_SLIME: - DoCast(me->getVictim(), SPELL_SLIME_BOLT, true); + DoCast(me->GetVictim(), SPELL_SLIME_BOLT, true); events.ScheduleEvent(EVENT_SLIME, 2000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index c78f7d0a757..4b865046e60 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -111,7 +111,7 @@ public: switch (eventId) { case EVENT_STRIKE: - DoCast(me->getVictim(), SPELL_UNBALANCING_STRIKE); + DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE); events.ScheduleEvent(EVENT_STRIKE, 30000); return; case EVENT_SHOUT: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index ebd1aa85078..3f5a1021729 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -174,7 +174,7 @@ class boss_sapphiron : public CreatureScript Map::PlayerList const &players = _map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) + if (itr->GetSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) { _canTheHundredClub = false; break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index ea50c67ad1c..1a2c5294f61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -124,11 +124,11 @@ public: // and each mob will send its status at reset (meaning that it is alive) checkFeugenAlive = false; if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) - checkFeugenAlive = pFeugen->isAlive(); + checkFeugenAlive = pFeugen->IsAlive(); checkStalaggAlive = false; if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG))) - checkStalaggAlive = pStalagg->isAlive(); + checkStalaggAlive = pStalagg->IsAlive(); if (!checkFeugenAlive && !checkStalaggAlive) { @@ -260,7 +260,7 @@ public: events.ScheduleEvent(EVENT_SHIFT, 30000); return; case EVENT_CHAIN: - DoCast(me->getVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); + DoCast(me->GetVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: @@ -269,8 +269,8 @@ public: } } - if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->getVictim())) - DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); + if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->GetVictim())) + DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); else DoMeleeAttackIfReady(); } @@ -340,8 +340,8 @@ public: { if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN))) { - Unit* pStalaggVictim = me->getVictim(); - Unit* pFeugenVictim = pFeugen->getVictim(); + Unit* pStalaggVictim = me->GetVictim(); + Unit* pFeugenVictim = pFeugen->GetVictim(); if (pFeugenVictim && pStalaggVictim) { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index b85c24a22eb..9fe4c930768 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -675,7 +675,7 @@ public: void MoveInLineOfSight(Unit* who) { - if (!me->isInCombat() || _phase != PHASE_ONE) + if (!me->IsInCombat() || _phase != PHASE_ONE) return; if (who->GetEntry() == NPC_POWER_SPARK) @@ -819,7 +819,7 @@ public: break; } - me->CastSpell(me->getVictim(), SPELL_ARCANE_BREATH); + me->CastSpell(me->GetVictim(), SPELL_ARCANE_BREATH); events.ScheduleEvent(EVENT_ARCANE_BREATH, 20*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_ARCANE_STORM: @@ -1046,7 +1046,7 @@ public: Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_EYE_OF_ETERNITY) player->GetSession()->SendPacket(data); } @@ -1426,7 +1426,7 @@ class npc_nexus_lord : public CreatureScript _events.ScheduleEvent(EVENT_HASTE_BUFF, 15*IN_MILLISECONDS); break; case EVENT_NUKE_DUMMY: - DoCast(me->getVictim(), SPELL_DUMMY_NUKE, true); + DoCast(me->GetVictim(), SPELL_DUMMY_NUKE, true); DoCast(me, SPELL_ALIGN_DISK_AGGRO, true); _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1*IN_MILLISECONDS); break; @@ -1901,7 +1901,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader if (Unit* target = (*itr)->getTarget()) { Player* targetPlayer = target->ToPlayer(); - if (!targetPlayer || targetPlayer->isGameMaster()) + if (!targetPlayer || targetPlayer->IsGameMaster()) continue; if (InstanceScript* instance = caster->GetInstanceScript()) @@ -1999,7 +1999,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader { Creature* caster = GetCaster()->ToCreature(); if (Creature* target = GetHitCreature()) - target->GetMotionMaster()->MoveChase(caster->getVictim()); + target->GetMotionMaster()->MoveChase(caster->GetVictim()); } void Register() diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 079732b0f14..696ef48ba93 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -206,7 +206,7 @@ public: { Player* player = target->ToPlayer(); - if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) + if (!player || player->IsGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; player->CastSpell(trigger, SPELL_VORTEX_4, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index e84431a0788..c20f7da5d2e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -181,7 +181,7 @@ public: if (uiCrystalfireBreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH); + DoCast(me->GetVictim(), SPELL_CRYSTALFIRE_BREATH); uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; } else uiCrystalfireBreathTimer -= diff; @@ -217,7 +217,7 @@ public: InstanceScript* instance = go->GetInstanceScript(); Creature* pKeristrasza = Unit::GetCreature(*go, instance ? instance->GetData64(DATA_KERISTRASZA) : 0); - if (pKeristrasza && pKeristrasza->isAlive()) + if (pKeristrasza && pKeristrasza->IsAlive()) { // maybe these are hacks :( go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 26bf80cb32e..7bf6bb247fa 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -193,7 +193,7 @@ public: void SummonedCreatureDespawn(Creature* summon) { - if (summon->isAlive()) + if (summon->IsAlive()) return; if (summon->GetGUID() == uiFireMagusGUID) @@ -313,7 +313,7 @@ public: if (uiGravityWellTimer <= diff) { - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) { DoCast(target, SPELL_GRAVITY_WELL); uiCooldown = 6*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 81d5141a6a6..03d97ebf33d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -71,7 +71,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index d27909328a5..bdc7096d2ad 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -210,7 +210,7 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE); + DoCast(me->GetVictim(), SPELL_ARCANE_BARRAGE); events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 57a9c9958df..bf513b51855 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -273,10 +273,10 @@ public: if (arcaneExplosionTimer <= uiDiff) { Position pPos; - me->getVictim()->GetPosition(&pPos); + me->GetVictim()->GetPosition(&pPos); me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); + me->GetMotionMaster()->MoveChase(me->GetVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); Talk(EMOTE_ARCANE_EXPLOSION); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 111e6b2c7aa..c7da2e695f4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -134,7 +134,7 @@ public: events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC); + DoCast(me->GetVictim(), SPELL_CALL_AMPLIFY_MAGIC); events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index fcd23b0ce6d..94f08d82f94 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -131,7 +131,7 @@ public: creature->SetPhaseMask(1, true); break; case NPC_CENTRIFUGE_CONSTRUCT: - if (creature->isAlive()) + if (creature->IsAlive()) DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter); break; case NPC_BELGARISTRASZ: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 71ef0cbe3ce..e9e9cf65e1f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -218,7 +218,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (InstanceScript* instance = creature->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index e7c6e920970..80453d62e29 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -154,7 +154,7 @@ public: { if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*me), m_auiStormforgedLieutenantGUID[i]))) { - if (!pStormforgedLieutenant->isAlive()) + if (!pStormforgedLieutenant->IsAlive()) pStormforgedLieutenant->Respawn(); } } @@ -295,7 +295,7 @@ public: if (m_uiPummel_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_PUMMEL); + DoCast(me->GetVictim(), SPELL_PUMMEL); m_uiPummel_Timer = urand(10000, 11000); } else @@ -316,7 +316,7 @@ public: if (m_uiIntercept_Timer <= uiDiff) { //not much point is this, better random target and more often? - DoCast(me->getVictim(), SPELL_INTERCEPT); + DoCast(me->GetVictim(), SPELL_INTERCEPT); m_uiIntercept_Timer = urand(45000, 46000); } else @@ -332,7 +332,7 @@ public: if (m_uiCleave_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); m_uiCleave_Timer = urand(8000, 9000); } else @@ -344,7 +344,7 @@ public: { if (m_uiMortalStrike_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); m_uiMortalStrike_Timer = urand(20000, 21000); } else @@ -352,7 +352,7 @@ public: if (m_uiSlam_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SLAM); + DoCast(me->GetVictim(), SPELL_SLAM); m_uiSlam_Timer = urand(15000, 16000); } else @@ -406,7 +406,7 @@ public: { if (Creature* pBjarngrim = instance->instance->GetCreature(instance->GetData64(DATA_BJARNGRIM))) { - if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) + if (pBjarngrim->IsAlive() && !pBjarngrim->GetVictim()) pBjarngrim->AI()->AttackStart(who); } } @@ -420,7 +420,7 @@ public: if (m_uiArcWeld_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_ARC_WELD); + DoCast(me->GetVictim(), SPELL_ARC_WELD); m_uiArcWeld_Timer = urand(20000, 21000); } else @@ -432,7 +432,7 @@ public: { if (Creature* pBjarngrim = instance->instance->GetCreature(instance->GetData64(DATA_BJARNGRIM))) { - if (pBjarngrim->isAlive()) + if (pBjarngrim->IsAlive()) DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9ce8ea3c52c..5ebe44c7b22 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -172,7 +172,7 @@ public: { if (Creature* pSpark = Unit::GetCreature(*me, *itr)) { - if (pSpark->isAlive()) + if (pSpark->IsAlive()) { pSpark->SetSpeed(MOVE_RUN, 2.0f); pSpark->GetMotionMaster()->Clear(); @@ -243,8 +243,8 @@ public: uiSplitTimer = 25*IN_MILLISECONDS; bIsSplitPhase = true; - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } else @@ -265,7 +265,7 @@ public: if (uiBallLightningTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); + DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else @@ -350,7 +350,7 @@ public: if (instance) { Creature* pIonar = instance->instance->GetCreature(instance->GetData64(DATA_IONAR)); - if (pIonar && pIonar->isAlive()) + if (pIonar && pIonar->IsAlive()) { if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1e41f346942..e76622280ac 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -168,7 +168,7 @@ public: { if (Creature* temp = Unit::GetCreature(*me, *itr)) { - if (temp->isAlive()) + if (temp->IsAlive()) temp->DespawnOrUnsummon(); } } @@ -186,7 +186,7 @@ public: if (Creature* temp = Unit::GetCreature(*me, *itr)) { // Only shatter brittle golems - if (temp->isAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM) + if (temp->IsAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM) { temp->CastSpell(temp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); GolemsShattered += 1; @@ -236,8 +236,8 @@ public: if (m_uiPause_Timer <= uiDiff) { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE) - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); m_bHasTemper = false; m_bIsStriking = false; @@ -443,7 +443,7 @@ public: if (m_uiImmolation_Timer <= uiDiff) { - DoCast(me->getVictim(), SPELL_IMMOLATION_STRIKE_N); + DoCast(me->GetVictim(), SPELL_IMMOLATION_STRIKE_N); m_uiImmolation_Timer = 5000; } else diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index adbc8827212..0603ce0f764 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -173,8 +173,8 @@ public: //and correct movement, if not already if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE) { - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); + if (me->GetVictim()) + me->GetMotionMaster()->MoveChase(me->GetVictim()); } } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 71222aba88b..464d6f13e4d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -126,7 +126,7 @@ public: if (StormOfGriefTimer <= diff) { - DoCast(me->getVictim(), SPELL_STORM_OF_GRIEF_N, true); + DoCast(me->GetVictim(), SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = urand(15000, 20000); } else StormOfGriefTimer -= diff; @@ -145,7 +145,7 @@ public: if (target) DoCast(target, SPELL_PILLAR_OF_WOE_N); else - DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N); + DoCast(me->GetVictim(), SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = urand(5000, 25000); } else PillarOfWoeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 3b0faa08574..359c7e0172e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -168,7 +168,7 @@ public: if (uiStaticChargeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STATIC_CHARGE); + DoCast(me->GetVictim(), SPELL_STATIC_CHARGE); uiStaticChargeTimer = urand(20000, 25000); } uiStaticChargeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 0a9ae889588..3b9f3125154 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -186,7 +186,7 @@ public: uint32 uiPositionCounter = 0; for (std::list<Creature*>::const_iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) { - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) { if (uiPositionCounter == 0) { @@ -216,7 +216,7 @@ public: { if (Creature* pKaddrak = Unit::GetCreature(*me, *itr)) { - if (pKaddrak->isAlive()) + if (pKaddrak->IsAlive()) pKaddrak->CastSpell(target, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); } } @@ -279,7 +279,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -337,7 +337,7 @@ public: for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) { Creature* temp = Unit::GetCreature(*me, instance ? (*itr) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DespawnOrUnsummon(); } lDwarfGUIDList.clear(); @@ -350,7 +350,7 @@ public: case 7: if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) { - if (!creature->isAlive()) + if (!creature->IsAlive()) creature->Respawn(); CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, creature->AI())->UpdateFacesList(); uiControllerGUID = creature->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 5a5efc36b3c..d1e13be3f60 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -360,7 +360,7 @@ class boss_algalon_the_observer : public CreatureScript case EVENT_DESPAWN_ALGALON: events.Reset(); events.SetPhase(PHASE_ROLE_PLAY); - if (me->isInCombat()) + if (me->IsInCombat()) events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_1, 5000); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_2, 17000); @@ -1074,7 +1074,7 @@ class spell_algalon_phase_punch : public SpellScriptLoader class NotVictimFilter { public: - NotVictimFilter(Unit* caster) : _victim(caster->getVictim()) + NotVictimFilter(Unit* caster) : _victim(caster->GetVictim()) { } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index b3f5cc38c9f..74308245114 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -204,11 +204,11 @@ class boss_steelbreaker : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) Brundir->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) - if (Molgeim->isAlive()) + if (Molgeim->IsAlive()) Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); } } @@ -242,7 +242,7 @@ class boss_steelbreaker : public CreatureScript events.CancelEvent(EVENT_BERSERK); break; case EVENT_FUSION_PUNCH: - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) DoCastVictim(SPELL_FUSION_PUNCH); events.ScheduleEvent(EVENT_FUSION_PUNCH, urand(13000, 22000)); break; @@ -341,11 +341,11 @@ class boss_runemaster_molgeim : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRUNDIR))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) Brundir->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); } } @@ -382,12 +382,12 @@ class boss_runemaster_molgeim : public CreatureScript { case 1: if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) target = Steelbreaker; break; case 2: if (Creature* Brundir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Brundir->isAlive()) + if (Brundir->IsAlive()) target = Brundir; break; default: @@ -506,11 +506,11 @@ class boss_stormcaller_brundir : public CreatureScript //DoCastAOE(SPELL_SUPERCHARGE, true); if (Creature* Molgeim = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOLGEIM))) - if (Molgeim->isAlive()) + if (Molgeim->IsAlive()) Molgeim->AI()->DoAction(ACTION_SUPERCHARGE); if (Creature* Steelbreaker = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STEELBREAKER))) - if (Steelbreaker->isAlive()) + if (Steelbreaker->IsAlive()) Steelbreaker->AI()->DoAction(ACTION_SUPERCHARGE); } @@ -594,12 +594,12 @@ class boss_stormcaller_brundir : public CreatureScript //me->SetLevitate(false); me->RemoveAurasDueToSpell(RAID_MODE(SPELL_LIGHTNING_TENDRILS_10M, SPELL_LIGHTNING_TENDRILS_25M)); me->RemoveAurasDueToSpell(SPELL_LIGHTNING_TENDRILS_VISUAL); - DoStartMovement(me->getVictim()); + DoStartMovement(me->GetVictim()); events.CancelEvent(EVENT_GROUND); me->getThreatManager().resetAllAggro(); break; case EVENT_MOVE_POSITION: - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { float x = float(irand(-25, 25)); float y = float(irand(-25, 25)); @@ -701,7 +701,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); - GetTarget()->CastSpell(GetTarget(), SPELL_RUNE_OF_SUMMONING_SUMMON, true, NULL, aurEff, GetTarget()->isSummon() ? GetTarget()->ToTempSummon()->GetSummonerGUID() : 0); + GetTarget()->CastSpell(GetTarget(), SPELL_RUNE_OF_SUMMONING_SUMMON, true, NULL, aurEff, GetTarget()->IsSummon() ? GetTarget()->ToTempSummon()->GetSummonerGUID() : 0); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 5faa2cc4628..b2d6dbca7b1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -146,8 +146,8 @@ class boss_auriaya : public CreatureScript if (summoned->GetEntry() == NPC_FERAL_DEFENDER) { - if (!summoned->isInCombat() && me->getVictim()) - summoned->AI()->AttackStart(me->getVictim()); + if (!summoned->IsInCombat() && me->GetVictim()) + summoned->AI()->AttackStart(me->GetVictim()); summoned->SetAuraStack(SPELL_FERAL_ESSENCE, summoned, 9); DefenderGUID = summoned->GetGUID(); DoZoneInCombat(summoned); @@ -247,8 +247,8 @@ class boss_auriaya : public CreatureScript if (defenderLives) Defender->SetAuraStack(SPELL_FERAL_ESSENCE, Defender, defenderLives); Defender->SetInCombatWithZone(); - if (!Defender->isInCombat()) - Defender->AI()->AttackStart(me->getVictim()); + if (!Defender->IsInCombat()) + Defender->AI()->AttackStart(me->GetVictim()); events.CancelEvent(EVENT_RESPAWN_DEFENDER); } break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 37ecf7874b8..bec1a32e2e8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -531,7 +531,7 @@ class boss_flame_leviathan : public CreatureScript } private: - //! Copypasta from DoSpellAttackIfReady, only difference is the target - it cannot be selected trough getVictim this way - + //! Copypasta from DoSpellAttackIfReady, only difference is the target - it cannot be selected trough GetVictim this way - //! I also removed the spellInfo check void DoBatteringRamIfReady() { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 3299148ea43..09298de1698 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -330,7 +330,7 @@ class boss_freya : public CreatureScript for (uint8 n = 0; n < 3; ++n) { Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n)); - if (Elder[n] && Elder[n]->isAlive()) + if (Elder[n] && Elder[n]->IsAlive()) { me->AddAura(SPELL_DRAINED_OF_POWER, Elder[n]); Elder[n]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); @@ -342,19 +342,19 @@ class boss_freya : public CreatureScript } } - if (Elder[0] && Elder[0]->isAlive()) + if (Elder[0] && Elder[0]->IsAlive()) { Elder[0]->CastSpell(me, SPELL_BRIGHTLEAF_ESSENCE, true); events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(10000, 20000)); } - if (Elder[1] && Elder[1]->isAlive()) + if (Elder[1] && Elder[1]->IsAlive()) { Elder[1]->CastSpell(me, SPELL_STONEBARK_ESSENCE, true); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(10000, 20000)); } - if (Elder[2] && Elder[2]->isAlive()) + if (Elder[2] && Elder[2]->IsAlive()) { Elder[2]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true); events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(10000, 20000)); @@ -474,7 +474,7 @@ class boss_freya : public CreatureScript { for (uint8 n = 0; n < 3; ++n) { - if (Elemental[n][i]->isAlive()) + if (Elemental[n][i]->IsAlive()) Elemental[n][i]->SetHealth(Elemental[n][i]->GetMaxHealth()); else Elemental[n][i]->Respawn(); @@ -605,7 +605,7 @@ class boss_freya : public CreatureScript for (uint8 n = 0; n < 3; ++n) { Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n)); - if (Elder[n] && Elder[n]->isAlive()) + if (Elder[n] && Elder[n]->IsAlive()) { Elder[n]->RemoveAllAuras(); Elder[n]->AttackStop(); @@ -1068,7 +1068,7 @@ class npc_detonating_lasher : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) { // Switching to other target - modify aggro of new target by 20% from current target's aggro - me->AddThreat(target, me->getThreatManager().getThreat(me->getVictim(), false) * 1.2f); + me->AddThreat(target, me->getThreatManager().getThreat(me->GetVictim(), false) * 1.2f); me->AI()->AttackStart(target); } changeTargetTimer = urand(5000, 10000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 1642cc0483f..5ee55febba3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -231,7 +231,7 @@ class boss_general_vezax : public CreatureScript // If Shaman has Shamanistic Rage and use it during the fight, it will cast Corrupted Rage on him Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->HasSpell(SPELL_SHAMANTIC_RAGE)) player->CastSpell(player, SPELL_CORRUPTED_RAGE, false); } @@ -278,7 +278,7 @@ class boss_general_vezax : public CreatureScript Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { float distance = player->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); if (rangeMin > distance || distance > rangeMax) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 0f99ea9cc2d..33958f0a38a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -195,16 +195,16 @@ class npc_flash_freeze : public CreatureScript void UpdateAI(uint32 diff) { - if (!UpdateVictim() || me->getVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->getVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) + if (!UpdateVictim() || me->GetVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->GetVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; - if (me->getVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) + if (me->GetVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) me->DespawnOrUnsummon(); if (checkDespawnTimer <= diff) { if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) - if (!target->isAlive()) + if (!target->IsAlive()) me->DisappearAndDie(); checkDespawnTimer = 2500; } @@ -277,7 +277,7 @@ class npc_ice_block : public CreatureScript if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) { - if (!Hodir->isInCombat()) + if (!Hodir->IsInCombat()) { Hodir->SetReactState(REACT_AGGRESSIVE); Hodir->AI()->DoZoneInCombat(); @@ -484,7 +484,7 @@ class boss_hodir : public CreatureScript for (std::list<Unit*>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { Unit* target = *itr; - if (!target || !target->isAlive() || GetClosestCreatureWithEntry(target, NPC_SNOWPACKED_ICICLE, 5.0f)) + if (!target || !target->IsAlive() || GetClosestCreatureWithEntry(target, NPC_SNOWPACKED_ICICLE, 5.0f)) continue; if (target->HasAura(SPELL_FLASH_FREEZE_HELPER) || target->HasAura(SPELL_BLOCK_OF_ICE)) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index b040a64c75a..2d5ddb50e5d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -175,7 +175,7 @@ class boss_ignis : public CreatureScript summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED | UNIT_FLAG_STUNNED | UNIT_FLAG_DISABLE_MOVE); } - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoZoneInCombat(); summons.Summon(summon); } @@ -251,7 +251,7 @@ class boss_ignis : public CreatureScript break; case EVENT_SCORCH: Talk(SAY_SCORCH); - if (Unit* target = me->getVictim()) + if (Unit* target = me->GetVictim()) me->SummonCreature(NPC_GROUND_SCORCH, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); events.ScheduleEvent(EVENT_SCORCH, 25000); @@ -452,7 +452,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (GetTarget()->isAlive()) + if (GetTarget()->IsAlive()) GetTarget()->CastSpell(GetTarget(), SPELL_SLAG_IMBUED, true); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index b558508f78a..7c9f534c27a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -257,7 +257,7 @@ class boss_kologarn : public CreatureScript switch (eventId) { case EVENT_MELEE_CHECK: - if (!me->IsWithinMeleeRange(me->getVictim())) + if (!me->IsWithinMeleeRange(me->GetVictim())) DoCast(SPELL_PETRIFY_BREATH); events.ScheduleEvent(EVENT_MELEE_CHECK, 1 * IN_MILLISECONDS); break; @@ -397,7 +397,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void FilterTargetsInitial(std::list<WorldObject*>& unitList) { // Remove "main tank" and non-player targets - unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->getVictim())); + unitList.remove_if(StoneGripTargetSelector(GetCaster()->ToCreature(), GetCaster()->GetVictim())); // Maximum affected targets per difficulty mode uint32 maxTargets = 1; if (GetSpellInfo()->Id == 63981) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index ac46fbc1227..79b04d412d1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -494,7 +494,7 @@ class boss_razorscale : public CreatureScript events.CancelEvent(EVENT_BUFFET); return; case EVENT_FUSE: - DoCast(me->getVictim(), SPELL_FUSEARMOR); + DoCast(me->GetVictim(), SPELL_FUSEARMOR); events.ScheduleEvent(EVENT_FUSE, 10000, 0, PHASE_PERMAGROUND); return; } @@ -864,7 +864,7 @@ class npc_darkrune_watcher : public CreatureScript if (ChainTimer <= Diff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTNING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); ChainTimer = urand(10000, 15000); } else @@ -924,7 +924,7 @@ class npc_darkrune_guardian : public CreatureScript if (StormTimer <= Diff) { - DoCast(me->getVictim(), SPELL_STORMSTRIKE); + DoCast(me->GetVictim(), SPELL_STORMSTRIKE); StormTimer = urand(4000, 8000); } else @@ -970,7 +970,7 @@ class npc_darkrune_sentinel : public CreatureScript if (HeroicTimer <= Diff) { - DoCast(me->getVictim(), SPELL_HEROIC_STRIKE); + DoCast(me->GetVictim(), SPELL_HEROIC_STRIKE); HeroicTimer = urand(4000, 6000); } else @@ -978,7 +978,7 @@ class npc_darkrune_sentinel : public CreatureScript if (WhirlTimer <= Diff) { - DoCast(me->getVictim(), SPELL_WHIRLWIND); + DoCast(me->GetVictim(), SPELL_WHIRLWIND); WhirlTimer = urand(20000, 25000); } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 76a60607f7e..39ef5284ba7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -579,11 +579,11 @@ class mob_pummeller : public CreatureScript if (!UpdateVictim()) return; - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { if (_arcingSmashTimer <= diff) { - DoCast(me->getVictim(), SPELL_ARCING_SMASH); + DoCast(me->GetVictim(), SPELL_ARCING_SMASH); _arcingSmashTimer = TIMER_ARCING_SMASH; } else @@ -591,7 +591,7 @@ class mob_pummeller : public CreatureScript if (_trampleTimer <= diff) { - DoCast(me->getVictim(), SPELL_TRAMPLE); + DoCast(me->GetVictim(), SPELL_TRAMPLE); _trampleTimer = TIMER_TRAMPLE; } else @@ -599,7 +599,7 @@ class mob_pummeller : public CreatureScript if (_uppercutTimer <= diff) { - DoCast(me->getVictim(), SPELL_UPPERCUT); + DoCast(me->GetVictim(), SPELL_UPPERCUT); _uppercutTimer = TIMER_UPPERCUT; } else @@ -753,9 +753,9 @@ class mob_life_spark : public CreatureScript if (_shockTimer <= diff) { - if (me->IsWithinMeleeRange(me->getVictim())) + if (me->IsWithinMeleeRange(me->GetVictim())) { - DoCast(me->getVictim(), SPELL_SHOCK); + DoCast(me->GetVictim(), SPELL_SHOCK); _shockTimer = TIMER_SHOCK; } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 97554a63217..cd3c059ad24 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -433,7 +433,7 @@ class boss_voice_of_yogg_saron : public CreatureScript void MoveInLineOfSight(Unit* who) { // TODO: MoveInLineOfSight doesn't work for such a big distance - if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->isInCombat()) + if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->IsInCombat()) me->SetInCombatWithZone(); } @@ -448,7 +448,7 @@ class boss_voice_of_yogg_saron : public CreatureScript // not sure, spoken by Sara (sound), regarding to wowwiki Voice whispers it Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { if (events.IsInPhase(PHASE_ONE)) Talk(WHISPER_VOICE_PHASE_1_WIPE, player->GetGUID()); @@ -750,7 +750,7 @@ class boss_sara : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; if (me->HasAura(SPELL_SHATTERED_ILLUSION)) @@ -932,7 +932,7 @@ class boss_yogg_saron : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { player->RemoveAurasDueToSpell(SPELL_SANITY); player->RemoveAurasDueToSpell(SPELL_INSANE); @@ -1609,7 +1609,7 @@ class npc_yogg_saron_keeper : public CreatureScript void UpdateAI(uint32 diff) { - if (!me->isInCombat()) + if (!me->IsInCombat()) return; _events.Update(diff); @@ -2428,7 +2428,7 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* vehicle = GetTarget()->GetVehicleBase()) - if (vehicle->isAlive()) + if (vehicle->IsAlive()) vehicle->Kill(vehicle); // should tentacle die or just release its target? } @@ -2910,7 +2910,7 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (GetTarget()->isAlive()) + if (GetTarget()->IsAlive()) GetTarget()->Kill(GetTarget()); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 421d0ecf3c9..4f7cbbff099 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -232,7 +232,7 @@ class instance_ulduar : public InstanceMapScript { Map::PlayerList const& Players = instance->GetPlayers(); if (!Players.isEmpty()) - if (Player* player = Players.begin()->getSource()) + if (Player* player = Players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } @@ -621,19 +621,19 @@ class instance_ulduar : public InstanceMapScript switch (eventId) { case EVENT_TOWER_OF_STORM_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_STORM_DESTROYED); break; case EVENT_TOWER_OF_FROST_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FROST_DESTROYED); break; case EVENT_TOWER_OF_FLAMES_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_FLAMES_DESTROYED); break; case EVENT_TOWER_OF_LIFE_DESTROYED: - if (FlameLeviathan && FlameLeviathan->isAlive()) + if (FlameLeviathan && FlameLeviathan->IsAlive()) FlameLeviathan->AI()->DoAction(ACTION_TOWER_OF_LIFE_DESTROYED); break; case EVENT_ACTIVATE_SANITY_WELL: @@ -724,7 +724,7 @@ class instance_ulduar : public InstanceMapScript // get item level (recheck weapons) Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) for (uint8 slot = EQUIPMENT_SLOT_MAINHAND; slot <= EQUIPMENT_SLOT_RANGED; ++slot) if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) if (item->GetTemplate()->ItemLevel > _maxWeaponItemLevel) @@ -736,7 +736,7 @@ class instance_ulduar : public InstanceMapScript Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 612be3b71e8..35d11522580 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -355,7 +355,7 @@ class PlayerOrPetCheck bool operator()(WorldObject* object) const { if (object->GetTypeId() != TYPEID_PLAYER) - if (!object->ToCreature()->isPet()) + if (!object->ToCreature()->IsPet()) return true; return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index dfb12a03c33..023ef126dd3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -237,7 +237,7 @@ public: case EVENT_JUST_TRANSFORMED: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetInCombatWithZone(); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); ScheduleSecondPhase(); return; case EVENT_SUMMON_BANSHEE: @@ -380,7 +380,7 @@ public: { ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY); - if (ingvar->getVictim()) + if (ingvar->GetVictim()) if (boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI* ai = CAST_AI(boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI, ingvar->AI())) ai->StartZombiePhase(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 896421909ad..90a1a3b1d69 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -87,7 +87,7 @@ public: { npc_frost_tombAI(Creature* creature) : ScriptedAI(creature) { - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summon = me->ToTempSummon()->GetSummoner()) DoCast(summon, SPELL_FROST_TOMB, true); @@ -154,7 +154,7 @@ public: { for (std::list<Creature*>::iterator itr = runemages.begin(); itr != runemages.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->IsWithinLOSInMap(me)) + if ((*itr)->IsAlive() && (*itr)->IsWithinLOSInMap(me)) (*itr)->AI()->AttackStart(who); } } @@ -165,7 +165,7 @@ public: { for (std::list<Creature*>::iterator itr = strategists.begin(); itr != strategists.end(); ++itr) { - if ((*itr)->isAlive() && (*itr)->IsWithinLOSInMap(me)) + if ((*itr)->IsAlive() && (*itr)->IsWithinLOSInMap(me)) (*itr)->AI()->AttackStart(who); } } @@ -324,7 +324,7 @@ public: } me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6)*IN_MILLISECONDS); break; } @@ -351,7 +351,7 @@ class spell_frost_tomb : public SpellScriptLoader { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_DEATH) if (Unit* caster = GetCaster()) - if (caster->ToCreature() && caster->isAlive()) + if (caster->ToCreature() && caster->IsAlive()) caster->ToCreature()->DespawnOrUnsummon(1000); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 75f643286b2..0331606240f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -126,7 +126,7 @@ public: Talk(YELL_SKARVALD_AGGRO); Unit* dalronn = Unit::GetUnit(*me, instance->GetData64(DATA_DALRONN)); - if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) + if (dalronn && dalronn->IsAlive() && !dalronn->GetVictim()) dalronn->getThreatManager().addThreat(who, 0.0f); instance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); @@ -226,7 +226,7 @@ public: if (StoneStrike_Timer <= diff) { - DoCast(me->getVictim(), SPELL_STONE_STRIKE); + DoCast(me->GetVictim(), SPELL_STONE_STRIKE); StoneStrike_Timer = 5000+rand()%5000; } else StoneStrike_Timer -= diff; @@ -291,7 +291,7 @@ public: if (!ghost && instance) { Unit* skarvald = Unit::GetUnit(*me, instance->GetData64(DATA_SKARVALD)); - if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) + if (skarvald && skarvald->IsAlive() && !skarvald->GetVictim()) skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 562aa5a3848..536e7293b69 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -116,7 +116,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 4f7f0e844bb..914d276f696 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -64,15 +64,15 @@ public: switch (fm_Type) { case 1: - instance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_1, me->IsAlive() ? NOT_STARTED : DONE); break; case 2: - instance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_2, me->IsAlive() ? NOT_STARTED : DONE); break; case 3: - instance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); + instance->SetData(EVENT_FORGE_3, me->IsAlive() ? NOT_STARTED : DONE); break; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 8e726c10fca..07567eb83da 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -134,19 +134,19 @@ public: instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FRENZIED_WORGEN)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); temp = Unit::GetCreature((*me), instance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); - if (temp && !temp->isAlive()) + if (temp && !temp->IsAlive()) temp->Respawn(); GameObject* go = instance->instance->GetGameObject(instance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); @@ -190,7 +190,7 @@ public: return; Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DisappearAndDie(); if (uiArcingSmashTimer <= diff) @@ -221,7 +221,7 @@ public: if (instance) instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); Creature* temp = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (temp && temp->isAlive()) + if (temp && temp->IsAlive()) temp->DisappearAndDie(); } @@ -244,7 +244,7 @@ public: move = Sequence[AddCount++]; //send orb to summon spot Creature* pOrb = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_MOB_ORB) : 0); - if (pOrb && pOrb->isAlive()) + if (pOrb && pOrb->IsAlive()) { if (currentPhase == PHASE_NONE) pOrb->CastSpell(me, SPELL_ORB_VISUAL, true); @@ -307,7 +307,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -320,7 +320,7 @@ public: if (uiChainLightingTimer <= diff) { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTING); + DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTING); uiChainLightingTimer = 5000 + rand() % 5000; } else uiChainLightingTimer -= diff; @@ -420,7 +420,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -433,7 +433,7 @@ public: if (uiMortalWoundTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); uiMortalWoundTimer = 3000 + rand() % 4000; } else uiMortalWoundTimer -= diff; @@ -536,7 +536,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -549,13 +549,13 @@ public: if (uiStompTimer <= diff) { - DoCast(me->getVictim(), SPELL_STOMP); + DoCast(me->GetVictim(), SPELL_STOMP); uiStompTimer = 8000 + rand() % 4000; } else uiStompTimer -= diff; if (uiGoreTimer <= diff) { - DoCast(me->getVictim(), SPELL_GORE); + DoCast(me->GetVictim(), SPELL_GORE); uiGoreTimer = 13000 + rand() % 4000; } else uiGoreTimer -= diff; @@ -656,7 +656,7 @@ public: if (instance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) { Creature* pPalehoof = Unit::GetCreature((*me), instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->Reset(); } } @@ -827,7 +827,7 @@ public: InstanceScript* instance = go->GetInstanceScript(); Creature* pPalehoof = Unit::GetCreature(*go, instance ? instance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) + if (pPalehoof && pPalehoof->IsAlive()) { go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); go->SetGoState(GO_STATE_ACTIVE); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 8ff0c798f00..2065277eb7c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -287,7 +287,7 @@ public: GetCreatureListWithEntryInGrid(lspectatorList, me, CREATURE_SPECTATOR, 100.0f); for (std::list<Creature*>::iterator itr = lspectatorList.begin(); itr != lspectatorList.end(); ++itr) { - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) { (*itr)->SetStandState(UNIT_STAND_STATE_STAND); (*itr)->SetWalk(false); @@ -365,7 +365,7 @@ public: if (sinsterStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_SINSTER_STRIKE); + DoCast(me->GetVictim(), SPELL_SINSTER_STRIKE); sinsterStrikeTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); } else @@ -607,7 +607,7 @@ class npc_scourge_hulk : public CreatureScript if (mightyBlow <= diff) { - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) if (!victim->HasUnitState(UNIT_STATE_STUNNED)) // Prevent knocking back a ritual player DoCast(victim, SPELL_MIGHTY_BLOW); mightyBlow = urand(12000, 17000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index f4c65216f4a..33cf1a96f80 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -266,13 +266,13 @@ public: if (m_uiFetidRot_Timer <= diff) { - DoCast(me->getVictim(), SPELL_FETID_ROT); + DoCast(me->GetVictim(), SPELL_FETID_ROT); m_uiFetidRot_Timer = urand(10000, 15000); } else m_uiFetidRot_Timer -= diff; if (m_uiDarkSlash_Timer <= diff) { - DoCast(me->getVictim(), SPELL_DARK_SLASH); + DoCast(me->GetVictim(), SPELL_DARK_SLASH); m_uiDarkSlash_Timer = urand(30000, 35000); } else m_uiDarkSlash_Timer -= diff; @@ -299,7 +299,7 @@ public: if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) { - DoCast(me->getVictim(), SPELL_SPIRIT_STRIKE); + DoCast(me->GetVictim(), SPELL_SPIRIT_STRIKE); m_uiAbility_HALDOR_Timer = 5000; // overtime } else m_uiAbility_HALDOR_Timer -= diff; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index baed96453dc..d2d6a4b648f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -92,7 +92,7 @@ class boss_emalon : public CreatureScript // AttackStart has NULL-check for victim if (summoned->AI()) - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void EnterCombat(Unit* who) @@ -102,7 +102,7 @@ class boss_emalon : public CreatureScript for (std::list<uint64>::const_iterator itr = summons.begin(); itr != summons.end(); ++itr) { Creature* minion = Unit::GetCreature(*me, *itr); - if (minion && minion->isAlive() && !minion->getVictim() && minion->AI()) + if (minion && minion->IsAlive() && !minion->GetVictim() && minion->AI()) minion->AI()->AttackStart(who); } } @@ -142,7 +142,7 @@ class boss_emalon : public CreatureScript if (!summons.empty()) { Creature* minion = Unit::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(summons)); - if (minion && minion->isAlive()) + if (minion && minion->IsAlive()) { minion->CastSpell(me, SPELL_OVERCHARGED, true); minion->SetFullHealth(); @@ -195,7 +195,7 @@ class mob_tempest_minion : public CreatureScript { if (Creature* emalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { - if (emalon->isAlive()) + if (emalon->IsAlive()) { emalon->SummonCreature(MOB_TEMPEST_MINION, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); Talk(EMOTE_MINION_RESPAWN); @@ -210,7 +210,7 @@ class mob_tempest_minion : public CreatureScript if (Creature* pEmalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { - if (!pEmalon->getVictim() && pEmalon->AI()) + if (!pEmalon->GetVictim() && pEmalon->AI()) pEmalon->AI()->AttackStart(who); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 9dbb10be601..f08f42be265 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -84,12 +84,12 @@ public: if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { - if (!pGuard1->isAlive()) + if (!pGuard1->IsAlive()) pGuard1->Respawn(); } if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { - if (!pGuard2->isAlive()) + if (!pGuard2->IsAlive()) pGuard2->Respawn(); } } @@ -109,13 +109,13 @@ public: if (Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0)) { pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_NON_ATTACKABLE); - if (!pGuard1->getVictim() && pGuard1->AI()) + if (!pGuard1->GetVictim() && pGuard1->AI()) pGuard1->AI()->AttackStart(who); } if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_NON_ATTACKABLE); - if (!pGuard2->getVictim() && pGuard2->AI()) + if (!pGuard2->GetVictim() && pGuard2->AI()) pGuard2->AI()->AttackStart(who); } } @@ -157,8 +157,8 @@ public: { if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { - if (!pGuard1->isAlive() && !pGuard2->isAlive()) - DoCast(me->getVictim(), SPELL_STORMSTRIKE); + if (!pGuard1->IsAlive() && !pGuard2->IsAlive()) + DoCast(me->GetVictim(), SPELL_STORMSTRIKE); } } } @@ -179,7 +179,7 @@ public: //If one of the adds is dead spawn heals faster Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); - uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; + uiChainHealTimer = ((pGuard1 && !pGuard1->IsAlive()) || (pGuard2 && !pGuard2->IsAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; @@ -191,7 +191,7 @@ public: if (uiEarthShockTimer <= diff) { - DoCast(me->getVictim(), SPELL_EARTH_SHOCK); + DoCast(me->GetVictim(), SPELL_EARTH_SHOCK); uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; @@ -237,11 +237,11 @@ public: return me->GetGUID(); Creature* pGuard1 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_1) : 0); - if (pGuard1 && pGuard1->isAlive() && !pGuard1->HealthAbovePct(75)) + if (pGuard1 && pGuard1->IsAlive() && !pGuard1->HealthAbovePct(75)) return pGuard1->GetGUID(); Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0); - if (pGuard2 && pGuard2->isAlive() && !pGuard2->HealthAbovePct(75)) + if (pGuard2 && pGuard2->IsAlive() && !pGuard2->HealthAbovePct(75)) return pGuard2->GetGUID(); return 0; @@ -312,19 +312,19 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_STRIKE); + DoCast(me->GetVictim(), SPELL_STRIKE); uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { - DoCast(me->getVictim(), SPELL_HOWLING_SCREECH); + DoCast(me->GetVictim(), SPELL_HOWLING_SCREECH); uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { - DoCast(me->getVictim(), SPELL_GUSHING_WOUND); + DoCast(me->GetVictim(), SPELL_GUSHING_WOUND); uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index db70177f8a0..8e43baecdb1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -153,7 +153,7 @@ public: void DoAction(int32 param) { - if (!me->isAlive()) + if (!me->IsAlive()) return; switch (param) @@ -192,7 +192,7 @@ public: } me->SetVisible(true); - me->GetMotionMaster()->MoveChase(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->GetVictim()); } uint32 GetData(uint32 type) const @@ -245,7 +245,7 @@ public: { for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr) if (Creature* temp = Unit::GetCreature(*me, *itr)) - if (temp->isAlive()) + if (temp->IsAlive()) { bIsWaterElementsAlive = true; break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 187cf5d6b30..bca65240794 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { - DoCast(me->getVictim(), SPELL_FIREBOLT); + DoCast(me->GetVictim(), SPELL_FIREBOLT); uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { - DoCast(me->getVictim(), SPELL_FLAME_BREATH); + DoCast(me->GetVictim(), SPELL_FLAME_BREATH); uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { - DoCast(me->getVictim(), SPELL_LAVA_BURN); + DoCast(me->GetVictim(), SPELL_LAVA_BURN); uiLavaBurnTimer = urand(15000, 23000); } @@ -130,7 +130,7 @@ public: { if (uiCauterizingFlamesTimer <= diff) { - DoCast(me->getVictim(), SPELL_CAUTERIZING_FLAMES); + DoCast(me->GetVictim(), SPELL_CAUTERIZING_FLAMES); uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index d308c6c696b..59ff6873a56 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -110,7 +110,7 @@ public: if (uiCorrosiveSalivaTimer <= diff) { - DoCast(me->getVictim(), SPELL_CORROSIVE_SALIVA); + DoCast(me->GetVictim(), SPELL_CORROSIVE_SALIVA); uiCorrosiveSalivaTimer = 10000; } else uiCorrosiveSalivaTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index b14a9e0dec5..d05f475b22f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -171,7 +171,7 @@ public: { if (uiArcaneBuffet_Timer < uiDiff) { - DoCast(me->getVictim(), SPELL_ARCANE_BUFFET); + DoCast(me->GetVictim(), SPELL_ARCANE_BUFFET); uiArcaneBuffet_Timer = 0; } else uiArcaneBuffet_Timer -= uiDiff; @@ -288,8 +288,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource()->isAlive()) - DoTeleportPlayer(i->getSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->getSource()->GetOrientation()); + if (i->GetSource()->IsAlive()) + DoTeleportPlayer(i->GetSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->GetSource()->GetOrientation()); } uiSummonPlayers_Timer = urand(33000, 35000); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 0f150fe88b8..a237845cf89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -130,7 +130,7 @@ public: if (SpellSummonVoidTimer <= diff) { - DoCast(me->getVictim(), SPELL_SUMMON_VOID_SENTRY, false); + DoCast(me->GetVictim(), SPELL_SUMMON_VOID_SENTRY, false); SpellSummonVoidTimer = 20000; } else SpellSummonVoidTimer -=diff; @@ -143,7 +143,7 @@ public: if (SpellShroudOfDarknessTimer <= diff) { - DoCast(me->getVictim(), SPELL_SHROUD_OF_DARKNESS); + DoCast(me->GetVictim(), SPELL_SHROUD_OF_DARKNESS); SpellShroudOfDarknessTimer = 20000; } else SpellShroudOfDarknessTimer -=diff; @@ -193,7 +193,7 @@ public: void JustSummoned(Creature* summon) { - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); summon->SetPhaseMask(17, true); } diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index df79366e6cd..ef96b1ea86f 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -671,11 +671,11 @@ public: Map::PlayerList const &players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player->isGameMaster()) + Player* player = itr->GetSource(); + if (player->IsGameMaster()) continue; - if (player->isAlive()) + if (player->IsAlive()) return false; } @@ -796,7 +796,7 @@ public: for (std::set<uint64>::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr) { Creature* creature = instance->GetCreature(*itr); - if (creature && creature->isAlive()) + if (creature && creature->IsAlive()) creature->CastSpell(creature, SPELL_ARCANE_LIGHTNING, true); // Who should cast the spell? } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index fbbf3fa3df5..303a1449644 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -844,7 +844,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -861,13 +861,13 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_BRUTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + DoCast(me->GetVictim(), SPELL_SUNDER_ARMOR); uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; @@ -1054,7 +1054,7 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->getVictim(), SPELL_CONCUSSION_BLOW); + DoCast(me->GetVictim(), SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; @@ -1249,7 +1249,7 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index b1091013270..fc9d79296cb 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -221,7 +221,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(11957) == QUEST_STATUS_INCOMPLETE) @@ -267,7 +267,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_ACES_HIGH) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) //It's the same dragon for both quests. @@ -562,7 +562,7 @@ public: go_caribou->SetLootState(GO_JUST_DEACTIVATED); if (TempSummon* summon = me->ToTempSummon()) - if (summon->isSummon()) + if (summon->IsSummon()) if (Unit* temp = summon->GetSummoner()) if (Player* player = temp->ToPlayer()) player->KilledMonsterCredit(me->GetEntry(), 0); @@ -1213,7 +1213,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE && creature->GetAreaId() == 4128) @@ -1266,7 +1266,7 @@ public: if (uiType != POINT_MOTION_TYPE) return; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->arthasInPosition = true; } @@ -1298,7 +1298,7 @@ public: me->AddUnitState(UNIT_STATE_STUNNED); me->CastSpell(me, SPELL_STUN, true); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->arlosInPosition = true; } @@ -1355,7 +1355,7 @@ public: if (uiType != POINT_MOTION_TYPE) return; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->talbotInPosition = true; } @@ -1378,19 +1378,19 @@ public: { if (shadowBoltTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); shadowBoltTimer = urand(5000, 12000); } else shadowBoltTimer -= uiDiff; if (deflectionTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_DEFLECTION); + DoCast(me->GetVictim(), SPELL_DEFLECTION); deflectionTimer = urand(20000, 25000); } else deflectionTimer -= uiDiff; if (soulBlastTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_SOUL_BLAST); + DoCast(me->GetVictim(), SPELL_SOUL_BLAST); soulBlastTimer = urand (12000, 18000); } else soulBlastTimer -= uiDiff; } @@ -1466,7 +1466,7 @@ public: me->AddUnitState(UNIT_STATE_STUNNED); me->CastSpell(me, SPELL_STUN, true); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) CAST_AI(npc_thassarian::npc_thassarianAI, summoner->GetAI())->leryssaInPosition = true; bDone = true; @@ -1474,7 +1474,7 @@ public: else { me->SetStandState(UNIT_STAND_STATE_SIT); - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) summoner->SetStandState(UNIT_STAND_STATE_SIT); phaseTimer = 1500; @@ -1491,7 +1491,7 @@ public: switch (phase) { case 1: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_4); @@ -1504,7 +1504,7 @@ public: ++phase; break; case 3: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_5); @@ -1517,7 +1517,7 @@ public: ++phase; break; case 5: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) thassarian->AI()->Talk(SAY_THASSARIAN_6); @@ -1531,7 +1531,7 @@ public: ++phase; break; case 7: - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (Creature* thassarian = summoner->ToCreature()) { @@ -2473,7 +2473,7 @@ public: if (player->HasAura(SPELL_RIGHTEOUS_VISION) && player->GetQuestStatus(QUEST_THE_HUNT_IS_ON) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, charGossipItem, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - if (creature->isVendor()) + if (creature->IsVendor()) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); player->SEND_GOSSIP_MENU(uiGossipText, creature->GetGUID()); diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index d3d77cdd9da..e629ade9f52 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -80,7 +80,7 @@ public: Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); - if (!player || player->isGameMaster() || player->IsBeingTeleported() || + if (!player || player->IsGameMaster() || player->IsBeingTeleported() || // If player has Disguise aura for quest A Meeting With The Magister or An Audience With The Arcanist, do not teleport it away but let it pass player->HasAura(SPELL_SUNREAVER_DISGUISE_FEMALE) || player->HasAura(SPELL_SUNREAVER_DISGUISE_MALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_FEMALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_MALE)) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index ed7354acb50..44bb405cf59 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -53,7 +53,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestRewardStatus(QUEST_RETURN_TO_AG_A) || player->GetQuestRewardStatus(QUEST_RETURN_TO_AG_H)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index e8eddea6ef7..3d65ced5736 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -75,7 +75,7 @@ public: if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 50.0f)) summoned->AI()->AttackStart(Mrfloppy); else - summoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->GetVictim()); } void WaypointReached(uint32 waypointId) @@ -664,7 +664,7 @@ class npc_venture_co_straggler : public CreatureScript if (uiChopTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CHOP); + DoCast(me->GetVictim(), SPELL_CHOP); uiChopTimer = urand(10000, 12000); } else @@ -692,6 +692,146 @@ class npc_venture_co_straggler : public CreatureScript } }; +/*###### +## Quest A Blade Fit For A Champion +######*/ + +enum LakeFrog +{ + // Spells + SPELL_WARTSBGONE_LIP_BALM = 62574, + SPELL_FROG_LOVE = 62537, // for 1 minute ! + SPELL_WARTS = 62581, + SPELL_MAIDEN_OF_ASHWOOD_LAKE_TRANSFORM = 62550, + SPELL_SUMMON_ASHWOOD_BRAND = 62554, + + // Items + ITEM_WARTS_B_GONE_LIP_BALM = 44986, + + // Creature + NPC_LAKE_FROG = 33211, + NPC_LAKE_FROG_QUEST = 33224, + + // Text + SAY_MAIDEN_0 = 0, + SAY_MAIDEN_1 = 1 +}; + +class npc_lake_frog : public CreatureScript +{ + public: + npc_lake_frog() : CreatureScript("npc_lake_frog") { } + + struct npc_lake_frogAI : public ScriptedAI + { + npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() + { + _following = false; + _runningScript = false; + _phase = 0; + if (me->GetEntry() == NPC_LAKE_FROG_QUEST) + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + void UpdateAI(uint32 diff) + { + if (_following) + if (!me->HasAura(SPELL_FROG_LOVE)) + me->DespawnOrUnsummon(0); + + if (_runningScript) + { + if (_scriptTimer <= diff) + { + switch (_phase) + { + case 0: + DoCast(me, SPELL_MAIDEN_OF_ASHWOOD_LAKE_TRANSFORM); + me->SetEntry(33220); + _scriptTimer = 2000; + ++_phase; + break; + case 1: + Talk(SAY_MAIDEN_0); + _scriptTimer = 3000; + ++_phase; + break; + case 2: + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + _scriptTimer = 25000; + ++_phase; + break; + case 3: + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + _scriptTimer = 2000; + ++_phase; + break; + case 4: + Talk(SAY_MAIDEN_1); + _scriptTimer = 4000; + ++_phase; + break; + case 5: + _runningScript = false; + me->DespawnOrUnsummon(0); + break; + } + } + else if (_scriptTimer) + _scriptTimer -= diff; + } + } + + void ReceiveEmote(Player* player, uint32 emote) + { + if (_following || _runningScript) + return; + + if (emote == TEXT_EMOTE_KISS && me->IsWithinDistInMap(player, 30.0f) && player->HasItemCount(ITEM_WARTS_B_GONE_LIP_BALM, 1, false)) + { + if (!player->HasAura(SPELL_WARTSBGONE_LIP_BALM)) + player->AddAura(SPELL_WARTS, player); + else + { + player->RemoveAura(SPELL_WARTSBGONE_LIP_BALM); + + if (me->GetEntry() == NPC_LAKE_FROG) + { + me->AddAura(SPELL_FROG_LOVE, me); + me->GetMotionMaster()->MoveFollow(player, 0.3f, frand(M_PI/2, M_PI + (M_PI/2))); + _following = true; + } + else if (me->GetEntry() == NPC_LAKE_FROG_QUEST) + { + me->GetMotionMaster()->MoveIdle(); + me->SetFacingToObject(player); + _runningScript = true; + _scriptTimer = 2000; + } + } + } + } + + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + { + DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND); + } + + private: + bool _following; + bool _runningScript; + uint32 _scriptTimer; + uint8 _phase; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new npc_lake_frogAI(creature); + } +}; + void AddSC_grizzly_hills() { new npc_emily(); @@ -702,4 +842,5 @@ void AddSC_grizzly_hills() new npc_wounded_skirmisher(); new npc_lightning_sentry(); new npc_venture_co_straggler(); + new npc_lake_frog(); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 268e904e292..32bc2f6e424 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -178,7 +178,7 @@ public: { uint64 summonerGUID = 0; - if (me->isSummon()) + if (me->IsSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummoner()) if (summoner->GetTypeId() == TYPEID_PLAYER) summonerGUID = summoner->GetGUID(); @@ -230,7 +230,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_REPORTS_FROM_THE_FIELD) == QUEST_STATUS_INCOMPLETE) @@ -340,7 +340,7 @@ public: { if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) { - if (player->isAlive()) + if (player->IsAlive()) { summon->SetWalk(false); summon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]); diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 0447d70b502..f5f832bcb86 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -67,7 +67,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_THE_STORY_THUS_FAR) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 57228595b9b..adf709ee304 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -130,7 +130,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) == QUEST_STATUS_INCOMPLETE) @@ -201,7 +201,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_MAKING_PEACE) == QUEST_STATUS_INCOMPLETE) @@ -262,7 +262,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_FREYA_PACT) == QUEST_STATUS_INCOMPLETE) @@ -844,7 +844,7 @@ public: std::list<Creature*> saboteurs; caster->GetCreatureListWithEntryInGrid(saboteurs, NPC_SABOTEUR, 200.0f); for (std::list<Creature*>::iterator itr = saboteurs.begin(); itr != saboteurs.end(); ++itr) - if ((*itr)->isAlive()) + if ((*itr)->IsAlive()) // Lifeforce has a cast duration, it should be cast at all saboteurs one by one presence->CastSpell((*itr), SPELL_LIFEFORCE, false); } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index ba725d2dda4..aa6c53c188b 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -202,7 +202,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); if (player->GetQuestStatus(QUEST_BITTER_DEPARTURE) == QUEST_STATUS_INCOMPLETE) @@ -252,15 +252,15 @@ public: bool OnGossipHello(Player* player, Creature* creature) { //Quest Menu - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if ( creature->isTrainer() ) + if ( creature->IsTrainer() ) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if ( creature->isVendor() ) + if ( creature->IsVendor() ) if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 1b944f9babb..43b5eaefc62 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -117,10 +117,10 @@ class npc_wg_demolisher_engineer : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (canBuild(creature)) + if (CanBuild(creature)) { if (player->HasAura(SPELL_CORPORAL)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_DEMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -142,7 +142,7 @@ class npc_wg_demolisher_engineer : public CreatureScript { player->CLOSE_GOSSIP_MENU(); - if (canBuild(creature)) + if (CanBuild(creature)) { switch (action - GOSSIP_ACTION_INFO_DEF) { @@ -163,7 +163,7 @@ class npc_wg_demolisher_engineer : public CreatureScript } private: - bool canBuild(Creature* creature) + bool CanBuild(Creature* creature) { Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) @@ -188,7 +188,7 @@ class npc_wg_spirit_guide : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); @@ -244,7 +244,7 @@ class npc_wg_queue : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); @@ -334,14 +334,14 @@ class npc_wg_quest_giver : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) return true; - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) { QuestRelationBounds objectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry()); QuestRelationBounds objectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry()); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 1d04a9b163c..825f1804e3c 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -212,7 +212,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) { - if (creature->isQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); @@ -660,7 +660,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { Talk(SAY_CALL_FOR_HELP); - //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? + //DoCast(me->GetVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) uiWhisker = pWhisker->GetGUID(); @@ -675,12 +675,12 @@ public: switch (summon->GetEntry()) { case NPC_WHISKER: - summon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->GetVictim()); break; case NPC_HUNGRY_PENGUIN: if (Unit* pAffected = Unit::GetUnit(*me, AffectedGUID)) { - if (pAffected->isAlive()) + if (pAffected->IsAlive()) summon->AI()->AttackStart(pAffected); } break; @@ -837,7 +837,7 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276f) + if (me->GetVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -857,13 +857,13 @@ public: if (uiCleaveTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CLEAVE); + DoCast(me->GetVictim(), SPELL_CLEAVE); uiCleaveTimer = 9000; } else uiCleaveTimer -= uiDiff; if (uiCorrodeFleshTimer <= uiDiff) { - DoCast(me->getVictim(), SPELL_CORRODE_FLESH); + DoCast(me->GetVictim(), SPELL_CORRODE_FLESH); uiCorrodeFleshTimer = 6000; } else uiCorrodeFleshTimer -= uiDiff; @@ -957,7 +957,7 @@ public: if (!UpdateVictim()) return; - if (Unit* victim = me->getVictim()) + if (Unit* victim = me->GetVictim()) { if (victim->GetPositionZ() >= 286.276f) { @@ -988,7 +988,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_KNOCK_AWAY); } uiKnockAwayTimer = 10000; @@ -998,7 +998,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->isAlive()) + if (target && target->IsAlive()) DoCast(target, SPELL_STINKY_BEARD); } uiStinkyBeardTimer = 15000; @@ -1104,7 +1104,7 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276f) + if (me->GetVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference*> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) @@ -1139,8 +1139,8 @@ public: if (temp->GetPositionZ() >= 287.00f) continue; - if (temp->getVictim()) - temp->GetMotionMaster()->MoveChase(temp->getVictim()); + if (temp->GetVictim()) + temp->GetMotionMaster()->MoveChase(temp->GetVictim()); } } |