*More cleanup..

--HG--
branch : trunk

5 files changed, 58 insertions, 72 deletions

diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
index 3ccc77ecb9c..1fc971b8b7a 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
@@ -276,8 +276,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
                 {
                     DoCast(target, SPELL_BLIND);
                     Blind_Timer = 40000;
-                }
-                else Blind_Timer = 1000;
+                } else Blind_Timer = 1000 + diff; // if target is out of melee range, wait a bit.
             } else Blind_Timer -= diff;
         }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
index dfd6920c3f9..17fbd03a9e1 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
@@ -511,7 +511,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         if (ShadowNovaTimer <= diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHADOWNOVA);
-            ShadowNovaTimer = phase == 3 ? 31000 : _UI32_MAX;
+            ShadowNovaTimer = phase == 3 ? 31000 : 4294967295;
         } else ShadowNovaTimer -= diff;
 
         if (phase != 2)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
index ad9b64b5765..b78e1d66fe7 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if (ResetTimer < diff)
+        if (ResetTimer <= diff)
         {
             float x, y, z, o;
             m_creature->GetHomePosition(x, y, z, o);
@@ -241,9 +241,9 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
                 return;
             }
             ResetTimer = 5000;
-        }else ResetTimer -= diff;
+        } else ResetTimer -= diff;
 
-        if (HealTimer < diff)
+        if (HealTimer <= diff)
         {
             uint32 health = m_creature->GetHealth();
             Unit* target = m_creature;
@@ -260,75 +260,64 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
             HealTimer = 15000;
         }else HealTimer -= diff;
 
-        if (RenewTimer < diff)
+        if (RenewTimer <= diff)
         {
             Unit* target = m_creature;
 
-            if (rand()%2 == 1)
-            {
+            if (urand(0,1))
                 if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
-                {
                     if (pAdd->isAlive())
                         target = pAdd;
-                }
-            }
+
             DoCast(target,Heroic ? SPELL_RENEW_HEROIC : SPELL_RENEW_NORMAL);
             RenewTimer = 5000;
-        }else RenewTimer -= diff;
+        } else RenewTimer -= diff;
 
-        if (ShieldTimer < diff)
+        if (ShieldTimer <= diff)
         {
             Unit* target = m_creature;
 
-            if (rand()%2 == 1)
-            {
+            if (urand(0,1))
                 if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
-                {
                     if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD))
                         target = pAdd;
-                }
-            }
 
             DoCast(target, SPELL_SHIELD);
             ShieldTimer = 7500;
-        }else ShieldTimer -= diff;
+        } else ShieldTimer -= diff;
 
-        if (DispelTimer < diff)
+        if (DispelTimer <= diff)
         {
             Unit* target = NULL;
             bool friendly = false;
 
-            if (rand()%2 == 1)
-                target = SelectUnit(SELECT_TARGET_RANDOM, 0);
+            if (urand(0,1))
+                target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
             else
             {
                 friendly = true;
 
-                if (rand()%2 == 1)
+                if (urand(0,1))
                     target = m_creature;
                 else
-                {
                     if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
-                    {
                         if (pAdd->isAlive())
                             target = pAdd;
-                    }
-                }
             }
 
             if (target)
                 DoCast(target, SPELL_DISPEL_MAGIC);
 
             DispelTimer = 12000;
-        }else DispelTimer -= diff;
+        } else DispelTimer -= diff;
 
         if (SWPainTimer < diff)
         {
-            if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, Heroic ? SPELL_SW_PAIN_HEROIC : SPELL_SW_PAIN_NORMAL);
 
             SWPainTimer = 10000;
-        }else SWPainTimer -= diff;
+        } else SWPainTimer -= diff;
 
         DoMeleeAttackIfReady();
     }
@@ -369,7 +358,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
         // For later development, some alternative threat system should be made
         // We do not know what this system is based upon, but one theory is class (healers=high threat, dps=medium, etc)
         // We reset their threat frequently as an alternative until such a system exist
-        ResetThreatTimer = 5000 + rand()%15000;
+        ResetThreatTimer = urand(5000,20000);
 
         // in case she is not alive and Reset was for some reason called, respawn her (most likely party wipe after killing her)
         if (Creature* pDelrissa = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_DELRISSA) : 0))
@@ -446,7 +435,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
         if (!pInstance)
             return;
 
-        if (Creature* Delrissa = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_DELRISSA))))
+        if (Creature* Delrissa = Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_DELRISSA)))
             Delrissa->AI()->KilledUnit(victim);
     }
 
@@ -464,17 +453,17 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UsedPotion && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25))
+        if (!UsedPotion && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25)
         {
             DoCast(m_creature, SPELL_HEALING_POTION);
             UsedPotion = true;
         }
 
-        if (ResetThreatTimer < diff)
+        if (ResetThreatTimer <= diff)
         {
             DoResetThreat();
             ResetThreatTimer = 5000 + rand()%15000;
-        }else ResetThreatTimer -= diff;
+        } else ResetThreatTimer -= diff;
     }
 };
 
@@ -520,7 +509,7 @@ struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_lackey
 
         boss_priestess_lackey_commonAI::UpdateAI(diff);
 
-        if (Vanish_Timer < diff)
+        if (Vanish_Timer <= diff)
         {
             DoCast(m_creature, SPELL_VANISH);
 
@@ -534,36 +523,36 @@ struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_lackey
             InVanish = true;
             Vanish_Timer = 30000;
             Wait_Timer = 10000;
-        }else Vanish_Timer -= diff;
+        } else Vanish_Timer -= diff;
 
         if (InVanish)
         {
-            if (Wait_Timer < diff)
+            if (Wait_Timer <= diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_BACKSTAB, true);
                 DoCast(m_creature->getVictim(), SPELL_KIDNEY_SHOT, true);
                 m_creature->SetVisibility(VISIBILITY_ON);       // ...? Hacklike
                 InVanish = false;
-            }else Wait_Timer -= diff;
+            } else Wait_Timer -= diff;
         }
 
-        if (Gouge_Timer < diff)
+        if (Gouge_Timer <= diff)
         {
             DoCast(m_creature->getVictim(), SPELL_GOUGE);
             Gouge_Timer = 5500;
-        }else Gouge_Timer -= diff;
+        } else Gouge_Timer -= diff;
 
-        if (Kick_Timer < diff)
+        if (Kick_Timer <= diff)
         {
             DoCast(m_creature->getVictim(), SPELL_KICK);
             Kick_Timer = 7000;
-        }else Kick_Timer -= diff;
+        } else Kick_Timer -= diff;
 
-        if (Eviscerate_Timer < diff)
+        if (Eviscerate_Timer <= diff)
         {
             DoCast(m_creature->getVictim(), SPELL_EVISCERATE);
             Eviscerate_Timer = 4000;
-        }else Eviscerate_Timer -= diff;
+        } else Eviscerate_Timer -= diff;
 
         if (!InVanish)
             DoMeleeAttackIfReady();
@@ -620,41 +609,41 @@ struct TRINITY_DLL_DECL boss_ellris_duskhallowAI : public boss_priestess_lackey_
 
         boss_priestess_lackey_commonAI::UpdateAI(diff);
 
-        if (Immolate_Timer < diff)
+        if (Immolate_Timer <= diff)
         {
             DoCast(m_creature->getVictim(),SPELL_IMMOLATE);
             Immolate_Timer = 6000;
-        }else Immolate_Timer -= diff;
+        } else Immolate_Timer -= diff;
 
-        if (Shadow_Bolt_Timer < diff)
+        if (Shadow_Bolt_Timer <= diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT);
             Shadow_Bolt_Timer = 5000;
-        }else Shadow_Bolt_Timer -= diff;
+        } else Shadow_Bolt_Timer -= diff;
 
-        if (Seed_of_Corruption_Timer < diff)
+        if (Seed_of_Corruption_Timer <= diff)
         {
             if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pUnit, SPELL_SEED_OF_CORRUPTION);
 
             Seed_of_Corruption_Timer = 10000;
-        }else Seed_of_Corruption_Timer -= diff;
+        } else Seed_of_Corruption_Timer -= diff;
 
-        if (Curse_of_Agony_Timer < diff)
+        if (Curse_of_Agony_Timer <= diff)
         {
             if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pUnit, SPELL_CURSE_OF_AGONY);
 
             Curse_of_Agony_Timer = 13000;
-        }else Curse_of_Agony_Timer -= diff;
+        } else Curse_of_Agony_Timer -= diff;
 
-        if (Fear_Timer < diff)
+        if (Fear_Timer <= diff)
         {
             if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pUnit, SPELL_FEAR);
 
             Fear_Timer = 10000;
-        }else Fear_Timer -= diff;
+        } else Fear_Timer -= diff;
 
         DoMeleeAttackIfReady();
     }
@@ -694,17 +683,17 @@ struct TRINITY_DLL_DECL boss_eramas_brightblazeAI : public boss_priestess_lackey
 
         boss_priestess_lackey_commonAI::UpdateAI(diff);
 
-        if (Knockdown_Timer < diff)
+        if (Knockdown_Timer <= diff)
         {
             DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN);
             Knockdown_Timer = 6000;
-        }else Knockdown_Timer -= diff;
+        } else Knockdown_Timer -= diff;
 
-        if (Snap_Kick_Timer < diff)
+        if (Snap_Kick_Timer <= diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SNAP_KICK);
             Snap_Kick_Timer  = 4500;
-        }else Snap_Kick_Timer -= diff;
+        } else Snap_Kick_Timer -= diff;
 
         DoMeleeAttackIfReady();
     }
diff --git a/src/bindings/scripts/scripts/kalimdor/desolace.cpp b/src/bindings/scripts/scripts/kalimdor/desolace.cpp
index c04162f2655..3d7676994c4 100644
--- a/src/bindings/scripts/scripts/kalimdor/desolace.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/desolace.cpp
@@ -161,12 +161,10 @@ bool GossipHello_npc_aged_dying_ancient_kodo(Player* pPlayer, Creature* pCreatur
 ## go_iruxos. Quest 5381
 ######*/
 
-bool GOHello_go_iruxos(Player *player, GameObject* _GO)
+bool GOHello_go_iruxos(Player *pPlayer, GameObject* pGO)
 {
-        if (player->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
-        {
-            player->SummonCreature(11876, player->GetInnPosX(),player->GetInnPosY(),player->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-        }
+        if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(),pPlayer->GetInnPosY(),pPlayer->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
 
         return true;
 }
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
index f290372715d..0d56eecc62c 100644
--- a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
@@ -56,21 +56,21 @@ struct TRINITY_DLL_DECL npc_teleportation_portalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (uiSpawnTimer < diff)
+        if (uiSpawnTimer <= diff)
         {
             if (Creature* pSummon = m_creature->SummonCreature(RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_SPELLBREAKER,
                                                                CREATURE_AZURE_BINDER,CREATURE_AZURE_MAGE_SLAYER,CREATURE_AZURE_CAPTAIN),
-                                                       m_creature->GetPositionX()+rand()%3, m_creature->GetPositionY()+rand()%3,
+                                                       m_creature->GetPositionX()+urand(0,2), m_creature->GetPositionY()+urand(0,2),
                                                        m_creature->GetPositionZ(),m_creature->GetOrientation(),
                                                        TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
                 pSummon->Attack(pSummon->SelectNearestTarget(100),true);
             uiSpawnTimer = SPAWN_TIME;
         } else uiSpawnTimer -= diff;
-        if (uiDespawnTimer < diff)
-        {
-            m_creature->Kill(m_creature);
-            m_creature->RemoveCorpse();
-        } else uiDespawnTimer -= diff;
+
+        if (uiDespawnTimer <= diff)
+            m_creature->DisappearAndDie();
+        else
+            uiDespawnTimer -= diff;
     }
 
     void JustDied(Unit* killer)