Core:

* add helping methods for manipulating unit's health and use it where applicable
* fix some conversion warnings and cleanup code (formatting, CRLF, tabs to spaces)

--HG--
branch : trunk

8 files changed, 18 insertions, 18 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 8acd4e782ac..8d1fe7d6117 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -86,7 +86,7 @@ public:
                 return;
 
             //If we are <50% hp cast Arcane Bubble
-            if (!bShielded && me->GetHealth()*100 / me->GetMaxHealth() <= 50)
+            if (!bShielded && !HealthAbovePct(50))
             {
                 //wait if we already casting
                 if (me->IsNonMeleeSpellCasted(false))
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 3a0b3eaa5a9..f421e447408 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -64,7 +64,7 @@ public:
                 return;
 
             //If we are <50% hp cast Soul Siphon rank 1
-            if (me->GetHealth()*100 / me->GetMaxHealth() <= 50 && !me->IsNonMeleeSpellCasted(false))
+            if (!HealthAbovePct(50) && !me->IsNonMeleeSpellCasted(false))
             {
                 //SoulSiphon_Timer
                 if (SoulSiphon_Timer <= diff)
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 9634bafb642..30a6c729796 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -82,7 +82,7 @@ public:
                 return;
 
             //If we are <35% hp
-            if (!HpYell && ((me->GetHealth()*100) / me->GetMaxHealth() <= 35))
+            if (!HpYell && !HealthAbovePct(35))
             {
                 DoScriptText(SAY_HEALTH, me);
                 HpYell = true;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index ca36128561e..096f58fe809 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -267,11 +267,11 @@ public:
             switch(Phase)
             {
                 case 1:
-                    if (((me->GetHealth() - damage)*100)/me->GetMaxHealth() < 67)
+                    if (me->HealthBelowPctDamaged(67, damage))
                         Disappear();
                     break;
                 case 2:
-                    if (((me->GetHealth() - damage)*100)/me->GetMaxHealth() < 34)
+                    if (me->HealthBelowPctDamaged(34, damage))
                         Disappear();
                     break;
                 case 3:
@@ -280,7 +280,7 @@ public:
                         die = true;
                         withbody = true;
                         wait = 300;
-                        damage = me->GetHealth() - me->GetMaxHealth()/100;
+                        damage = me->GetHealth() - me->CountPctFromMaxHealth(1);
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         me->StopMoving();
                         //me->GetMotionMaster()->MoveIdle();
@@ -585,7 +585,7 @@ public:
                 withhead = true;
                 me->RemoveAllAuras();
                 me->SetName("Headless Horseman");
-                me->SetHealth(me->GetMaxHealth());
+                me->SetFullHealth();
                 SaySound(SAY_REJOINED);
                 DoCast(me, SPELL_HEAD);
                 caster->GetMotionMaster()->Clear(false);
@@ -607,7 +607,7 @@ public:
             {
                 withhead = false;
                 returned = false;
-                damage = me->GetHealth() - me->GetMaxHealth()/100;
+                damage = me->GetHealth() - me->CountPctFromMaxHealth(1);
                 me->RemoveAllAuras();
                 me->SetName("Headless Horseman, Unhorsed");
 
@@ -727,7 +727,7 @@ public:
                 if (regen <= diff)
                 {
                     regen = 1000;                   //"body calls head"
-                    if (me->GetHealth()/me->GetMaxHealth() == 1 && !returned)
+                    if (me->IsFullHealth() && !returned)
                     {
                         if (Phase > 1)
                             --Phase;
@@ -891,7 +891,7 @@ void mob_head::mob_headAI::Disappear()
             me->RemoveAllAuras();
             body->RemoveAurasDueToSpell(SPELL_IMMUNE);//hack, SpellHit doesn't calls if body has immune aura
             DoCast(body, SPELL_FLYING_HEAD);
-            me->SetHealth(me->GetMaxHealth());
+            me->SetFullHealth();
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             me->GetMotionMaster()->MoveIdle();
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index d94ece456c0..ff9171994b5 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -89,7 +89,7 @@ public:
                 return;
 
             //If we are <30% hp goes Enraged
-            if (!Enrage && me->GetHealth()*100 / me->GetMaxHealth() <= 30 && !me->IsNonMeleeSpellCasted(false))
+            if (!Enrage && !HealthAbovePct(30) && !me->IsNonMeleeSpellCasted(false))
             {
                 DoScriptText(EMOTE_ENRAGE, me);
                 DoScriptText(SAY_ENRAGE, me);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index d149eb280bd..bb6b3e9f26c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -78,7 +78,7 @@ public:
                 return;
 
             //If we are <25% hp cast Heal
-            if (me->GetHealth()*100 / me->GetMaxHealth() <= 25 && !me->IsNonMeleeSpellCasted(false) && Heal_Timer <= diff)
+            if (!HealthAbovePct(25) && !me->IsNonMeleeSpellCasted(false) && Heal_Timer <= diff)
             {
                 DoCast(me, SPELL_HEAL);
                 Heal_Timer = 30000;
@@ -103,7 +103,7 @@ public:
             } else Sleep_Timer -= diff;
 
             //PowerWordShield_Timer
-            if (!PowerWordShield && me->GetHealth()*100 / me->GetMaxHealth() <= 25)
+            if (!PowerWordShield && !HealthAbovePct(25))
             {
                 DoCast(me, SPELL_POWERWORDSHIELD);
                 PowerWordShield = true;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index 23c6562e9c2..57335665e71 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -91,13 +91,13 @@ public:
                 return;
 
             //If we are low on hp Do sayings
-            if (!Yell60 && ((me->GetHealth()*100) / me->GetMaxHealth() <= 60))
+            if (!Yell60 && !HealthAbovePct(60))
             {
                 DoScriptText(SAY_HEALTH1, me);
                 Yell60 = true;
             }
 
-            if (!Yell30 && ((me->GetHealth()*100) / me->GetMaxHealth() <= 30))
+            if (!Yell30 && !HealthAbovePct(30))
             {
                 DoScriptText(SAY_HEALTH2, me);
                 Yell30 = true;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 7ae7311b4eb..aa7ae7f762c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -299,7 +299,7 @@ public:
             }
 
             //Cast Deep sleep when health is less than 50%
-            if (!m_bCanResurrectCheck && me->GetHealth()*100 / me->GetMaxHealth() <= 50)
+            if (!m_bCanResurrectCheck && !HealthAbovePct(50))
             {
                 if (me->IsNonMeleeSpellCasted(false))
                     me->InterruptNonMeleeSpells(false);
@@ -319,7 +319,7 @@ public:
             {
                 Creature* pTarget = NULL;
 
-                if (me->GetHealth() <= me->GetMaxHealth()*0.75f)
+                if (!HealthAbovePct(75))
                     pTarget = me;
 
                 if (m_pInstance)
@@ -327,7 +327,7 @@ public:
                     if (Creature* pMograine = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_MOGRAINE)))
                     {
                         // checking m_bCanResurrectCheck prevents her healing Mograine while he is "faking death"
-                        if (m_bCanResurrectCheck && pMograine->isAlive() && pMograine->GetHealth() <= pMograine->GetMaxHealth()*0.75f)
+                        if (m_bCanResurrectCheck && pMograine->isAlive() && !pMograine->HealthAbovePct(75))
                             pTarget = pMograine;
                     }
                 }