aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorMihapro <miha.penger@outlook.com>2018-01-03 16:39:00 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2018-01-03 16:39:32 +0100
commit8199eef81cad464bb43f3613ed884a2c8fc3973d (patch)
tree7a17cb8ede0a45814532dd306fcf7f37d2f90ce8 /src/server/scripts/Northrend
parentc2aead1da5b6cb9a3a69e276b3f12a2c76b9ab86 (diff)
Core/Misc: Added helper function Unit::SetFullPower
* Also renamed Unit::getPowerType and Unit::setPowerType to follow style guidelines Ref #20981
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp6
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp2
8 files changed, 10 insertions, 10 deletions
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 c31ca72b43d..b5468a8f266 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -629,7 +629,7 @@ struct boss_faction_championsAI : public BossAI
void UpdatePower()
{
- if (me->getPowerType() == POWER_MANA)
+ if (me->GetPowerType() == POWER_MANA)
me->ModifyPower(POWER_MANA, me->GetMaxPower(POWER_MANA) / 3);
}
@@ -698,7 +698,7 @@ struct boss_faction_championsAI : public BossAI
for (iter = tList.begin(); iter!=tList.end(); ++iter)
{
Unit* target = ObjectAccessor::GetUnit(*me, (*iter)->getUnitGuid());
- if (target && target->getPowerType() == POWER_MANA)
+ if (target && target->GetPowerType() == POWER_MANA)
return target;
}
return NULL;
@@ -1850,7 +1850,7 @@ class npc_toc_rogue : public CreatureScript
events.ScheduleEvent(EVENT_EVISCERATE, urand(20*IN_MILLISECONDS, 40*IN_MILLISECONDS));
events.ScheduleEvent(EVENT_WOUND_POISON, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
SetEquipmentSlots(false, 47422, 49982, EQUIP_NO_CHANGE);
- me->setPowerType(POWER_ENERGY);
+ me->SetPowerType(POWER_ENERGY);
me->SetMaxPower(POWER_ENERGY, 100);
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 0ab3388f7b9..94a3815ab2a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -531,7 +531,7 @@ class MistressKissTargetSelector
bool operator()(WorldObject* unit) const
{
- if (unit->GetTypeId() == TYPEID_PLAYER && unit->ToUnit()->getPowerType() == POWER_MANA)
+ if (unit->GetTypeId() == TYPEID_PLAYER && unit->ToUnit()->GetPowerType() == POWER_MANA)
return false;
return true;
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index b97e96c7eae..a873dc565ac 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -270,7 +270,7 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader
void RecalculateDamage()
{
- if (GetHitUnit()->getPowerType() != POWER_MANA)
+ if (GetHitUnit()->GetPowerType() != POWER_MANA)
return;
int32 const maxDamage = GetCaster()->GetMap()->IsHeroic() ? 15000 : 10000;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index c96bdc7388b..dd5dd5a5e64 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -1050,7 +1050,7 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader
void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
- if (GetUnitOwner()->getPowerType() == POWER_ENERGY && GetUnitOwner()->GetPower(POWER_ENERGY) == GetUnitOwner()->GetMaxPower(POWER_ENERGY))
+ if (GetUnitOwner()->GetPowerType() == POWER_ENERGY && GetUnitOwner()->GetPower(POWER_ENERGY) == GetUnitOwner()->GetMaxPower(POWER_ENERGY))
if (Creature* saurfang = GetUnitOwner()->ToCreature())
saurfang->AI()->DoAction(ACTION_MARK_OF_THE_FALLEN_CHAMPION);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index c4f03cefb10..e019c0d5933 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -220,7 +220,7 @@ class boss_lady_deathwhisper : public CreatureScript
Initialize();
_phase = PHASE_ONE;
DoCastSelf(SPELL_SHADOW_CHANNELING);
- me->SetPower(POWER_MANA, me->GetMaxPower(POWER_MANA));
+ me->SetFullPower(POWER_MANA);
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 0503c8f3764..963e02740db 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1145,7 +1145,7 @@ class UnchainedMagicTargetSelector
bool operator()(WorldObject* object) const
{
if (Unit* unit = object->ToUnit())
- return unit->getPowerType() != POWER_MANA;
+ return unit->GetPowerType() != POWER_MANA;
return true;
}
};
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index e422eab5488..664121ccd55 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -167,7 +167,7 @@ struct ManaVoidSelector : public std::unary_function<Unit*, bool>
bool operator()(Unit* unit) const
{
- return unit->getPowerType() == POWER_MANA && _source->GetDistance(unit) > 15.0f;
+ return unit->GetPowerType() == POWER_MANA && _source->GetDistance(unit) > 15.0f;
}
WorldObject const* _source;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 38eb73a9750..746922eef0f 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -200,7 +200,7 @@ struct ManaUserTargetSelector : public std::unary_function<Unit*, bool>
{
bool operator()(Unit const* target) const
{
- return target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA;
+ return target->GetTypeId() == TYPEID_PLAYER && target->GetPowerType() == POWER_MANA;
}
};