Merge [SD2]

r1100 Added basic AI definitions for boss sartharion (with adds, using a common AI for certain events) and intro calling drakes
r1101 Correcting a few details and simplify call drakes for boss sartharion
      Add boss and mini-boss' abilities and add more common events to common drakes AI
r1102 Drop support for Windows VC71 (2003) (ref Mangos rev 7865)
r1103 Added support for quest 6481 (summon npc 11920)
r1104 Restore compile after change in OnCreatureCreate(). Require Mangos 7871+ - skip (we don't merge 7871?)
r1105 Remove code related to taunt immune. creature_template.flags_extra(CREATURE_FLAG_EXTRA_NOT_TAUNTABLE) must be used instead where creature should always be immune.

--HG--
branch : trunk

17 files changed, 1018 insertions, 247 deletions

diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index fde415501c0..a615d579f4c 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -2818,18 +2818,6 @@
 								</File>
 							</Filter>
 						</Filter>
-                        <Filter
-                              Name="Obsidian Sanctum"
-                              >
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\def_obsidian_sanctum.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\instance_obsidian_sanctum.cpp"
-                                >
-                            </File>
-                        </Filter>
 						<Filter
 							Name="Vault of Archavon"
 							>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 958a0bf0eae..effb6e84d13 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -2819,18 +2819,6 @@
 								</File>
 							</Filter>
 						</Filter>
-                        <Filter
-                              Name="Obsidian Sanctum"
-                              >
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\def_obsidian_sanctum.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\instance_obsidian_sanctum.cpp"
-                                >
-                            </File>
-                        </Filter>
 						<Filter
 							Name="Vault of Archavon"
 							>
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp
index bd0e621c3c4..b50a0b79bf4 100644
--- a/src/bindings/scripts/scripts/go/go_scripts.cpp
+++ b/src/bindings/scripts/scripts/go/go_scripts.cpp
@@ -17,7 +17,7 @@
 /* ScriptData
 SDName: GO_Scripts
 SD%Complete: 100
-SDComment: Quest support: 4285,4287,4288(crystal pylons), 4296, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089
+SDComment: Quest support: 4285,4287,4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089
 SDCategory: Game Objects
 EndScriptData */
 
@@ -33,6 +33,7 @@ go_sacred_fire_of_life
 go_shrine_of_the_birds
 go_field_repair_bot_74A
 go_orb_of_command
+go_resonite_cask
 go_tablet_of_madness
 go_tablet_of_the_seven
 go_tele_to_dalaran_crystal
@@ -275,6 +276,23 @@ bool GOHello_go_ethereum_stasis(Player* pPlayer, GameObject* pGo)
 }
 
 /*######
+## go_resonite_cask
+######*/
+
+enum
+{
+    NPC_GOGGEROC    = 11920
+};
+
+bool GOHello_go_resonite_cask(Player* pPlayer, GameObject* pGO)
+{
+    if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER)
+        pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000);
+
+    return false;
+}
+
+/*######
 ## go_sacred_fire_of_life
 ######*/
 
@@ -434,6 +452,11 @@ void AddSC_go_scripts()
     newscript->RegisterSelf();
 
     newscript = new Script;
+    newscript->Name = "go_resonite_cask";
+    newscript->pGOHello =           &GOHello_go_resonite_cask;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
     newscript->Name = "go_sacred_fire_of_life";
     newscript->pGOHello =           &GOHello_go_sacred_fire_of_life;
     newscript->RegisterSelf();
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp
index c2582ffb600..9207f5d03a4 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp
@@ -48,9 +48,6 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
         MortalStrike_Timer = 20000;
         KnockBack_Timer = 30000;
         LeashCheck_Timer = 2000;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit *who)
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
index 808f381d197..c71b1871d94 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
@@ -79,9 +79,6 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
         TailLash_Timer = 10000;
         ClassCall_Timer = 35000;                            //35-40 seconds
         Phase3 = false;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void KilledUnit(Unit* Victim)
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
index 5267f1ef4b6..77e22a4d543 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
@@ -50,9 +50,6 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
         WarStomp_Timer = 35000;
         FireballVolley_Timer = 7000;
         Conflagration_Timer = 12000;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit *who)
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
index 9925cd6d3bc..a1b87ae6f01 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
@@ -72,9 +72,6 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
         TailSwipe_Timer = 20000;
         HasYelled = false;
         DoingSpeach = false;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void BeginSpeach(Unit* target)
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
index eea9a28da36..a2e28a19d5b 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI
     boss_temporusAI(Creature *c) : ScriptedAI(c)
     {
         pInstance = c->GetInstanceData();
-        HeroicMode = m_creature->GetMap()->IsHeroic();
+        HeroicMode = c->GetMap()->IsHeroic();
     }
 
     ScriptedInstance *pInstance;
@@ -58,9 +58,6 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI
 
     void Reset()
     {
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
-
         Haste_Timer = 15000+rand()%8000;
         SpellReflection_Timer = 30000;
         MortalWound_Timer = 8000;
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
index a0b4f632c42..26520fc16df 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
+++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
@@ -80,9 +80,6 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI
 
         if (pInstance)
             pInstance->SetData(DATA_GRUULEVENT, NOT_STARTED);
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit *who)
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
index 219256f4da8..3bb9ccbd0e2 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
@@ -191,9 +191,6 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
         ThunderClap_Timer = 15000;
         ResetThreat_Timer = 30000;
 
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
-
         if (pInstance)
             pInstance->SetData(TYPE_OMROGG, NOT_STARTED);   //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid.
     }
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
index 4906f02281a..9fb9d2226bd 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
@@ -131,8 +131,6 @@ struct  TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
                 {
                     AstralFlare->CastSpell(AstralFlare, SPELL_ASTRAL_FLARE_PASSIVE, false);
                     AstralFlare->AI()->AttackStart(target);
-                    AstralFlare->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-                    AstralFlare->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
                 }
 
                 //Reduce Mana by 10% of max health
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
index ab40ad745ef..7877dcbe686 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
@@ -185,9 +185,6 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
     void Reset()
     {
         ResetTimer = 2000;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit* who) {}
diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp
index c7034655b11..3fc3a2ff6de 100644
--- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp
+++ b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp
@@ -1,272 +1,1073 @@
-/* Script Data Start
-SDName: Boss sartharion
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
-/*** SQL START ***
-update creature_template set scriptname = '' where entry = '';
-*** SQL END ***/
+/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* ScriptData
+SDName: Boss Sartharion
+SD%Complete: 70%
+SDComment: Flame wave, achievement and portal events need to be implemented
+SDCategory: Obsidian Sanctum
+EndScriptData */
+
 #include "precompiled.h"
+#include "def_obsidian_sanctum.h"
+
+enum
+{
+    //Sartharion Yell
+    SAY_SARTHARION_AGGRO                        = -1615018,
+    SAY_SARTHARION_BERSERK                      = -1615019,
+    SAY_SARTHARION_BREATH                       = -1615020,
+    SAY_SARTHARION_CALL_SHADRON                 = -1615021,
+    SAY_SARTHARION_CALL_TENEBRON                = -1615022,
+    SAY_SARTHARION_CALL_VESPERON                = -1615023,
+    SAY_SARTHARION_DEATH                        = -1615024,
+    SAY_SARTHARION_SPECIAL_1                    = -1615025,
+    SAY_SARTHARION_SPECIAL_2                    = -1615026,
+    SAY_SARTHARION_SPECIAL_3                    = -1615027,
+    SAY_SARTHARION_SPECIAL_4                    = -1615028,
+    SAY_SARTHARION_SLAY_1                       = -1615029,
+    SAY_SARTHARION_SLAY_2                       = -1615030,
+    SAY_SARTHARION_SLAY_3                       = -1615031,
+
+    WHISPER_LAVA_CHURN                          = -1615032,
+
+    WHISPER_SHADRON_DICIPLE                     = -1615008,
+    WHISPER_VESPERON_DICIPLE                    = -1615041,
+    WHISPER_HATCH_EGGS                          = -1615017,
+    WHISPER_OPEN_PORTAL                         = -1615042, // whisper, shared by two dragons
+
+    //Sartharion Spells
+    SPELL_BERSERK                               = 61632,    // Increases the caster's attack speed by 150% and all damage it deals by 500% for 5 min.
+    SPELL_CLEAVE                                = 56909,    // Inflicts 35% weapon damage to an enemy and its nearest allies, affecting up to 10 targets.
+    SPELL_FLAME_BREATH                          = 56908,    // Inflicts 8750 to 11250 Fire damage to enemies in a cone in front of the caster.
+    SPELL_FLAME_BREATH_H                        = 58956,    // Inflicts 10938 to 14062 Fire damage to enemies in a cone in front of the caster.
+    SPELL_TAIL_LASH                             = 56910,    // A sweeping tail strike hits all enemies behind the caster, inflicting 3063 to 3937 damage and stunning them for 2 sec.
+    SPELL_TAIL_LASH_H                           = 58957,    // A sweeping tail strike hits all enemies behind the caster, inflicting 4375 to 5625 damage and stunning them for 2 sec.
+    SPELL_WILL_OF_SARTHARION                    = 61254,    // Sartharion's presence bolsters the resolve of the Twilight Drakes, increasing their total health by 25%. This effect also increases Sartharion's health by 25%.
+    SPELL_LAVA_STRIKE                           = 57571,    // (Real spell casted should be 57578) 57571 then trigger visual missile, then summon Lava Blaze on impact(spell 57572)
+    SPELL_TWILIGHT_REVENGE                      = 60639,
+
+    SPELL_TWILIGHT_SHIFT_ENTER                  = 57620,    // enter phase. Player get this when click GO
+    SPELL_TWILIGHT_SHIFT_REMOVAL                = 61187,    // leave phase
+    SPELL_TWILIGHT_SHIFT_REMOVAL_ALL            = 61190,    // leave phase (probably version to make all leave)
+
+    //Mini bosses common spells
+    SPELL_TWILIGHT_RESIDUE                      = 61885,    // makes immune to shadow damage, applied when leave phase
+
+    //Miniboses (Vesperon, Shadron, Tenebron)
+    SPELL_SHADOW_BREATH_H                       = 59126,    // Inflicts 8788 to 10212 Fire damage to enemies in a cone in front of the caster.
+    SPELL_SHADOW_BREATH                         = 57570,    // Inflicts 6938 to 8062 Fire damage to enemies in a cone in front of the caster.
+
+    SPELL_SHADOW_FISSURE_H                      = 59127,    // Deals 9488 to 13512 Shadow damage to any enemy within the Shadow fissure after 5 sec.
+    SPELL_SHADOW_FISSURE                        = 57579,    // Deals 6188 to 8812 Shadow damage to any enemy within the Shadow fissure after 5 sec.
+
+    //Vesperon
+    //In portal is a disciple, when disciple killed remove Power_of_vesperon, portal open multiple times
+    NPC_ACOLYTE_OF_VESPERON                     = 31219,    // Acolyte of Vesperon
+    SPELL_POWER_OF_VESPERON                     = 61251,    // Vesperon's presence decreases the maximum health of all enemies by 25%.
+    SPELL_TWILIGHT_TORMENT_VESP                 = 57948,    // (Shadow only) trigger 57935 then 57988
+    SPELL_TWILIGHT_TORMENT_VESP_ACO             = 58853,    // (Fire and Shadow) trigger 58835 then 57988
+
+    //Shadron
+    //In portal is a disciple, when disciple killed remove Power_of_vesperon, portal open multiple times
+    NPC_ACOLYTE_OF_SHADRON                      = 31218,    // Acolyte of Shadron
+    SPELL_POWER_OF_SHADRON                      = 58105,    // Shadron's presence increases Fire damage taken by all enemies by 100%.                     
+    SPELL_GIFT_OF_TWILIGTH_SHA                  = 57835,    // TARGET_SCRIPT shadron
+    SPELL_GIFT_OF_TWILIGTH_SAR                  = 58766,    // TARGET_SCRIPT sartharion
+
+    //Tenebron
+    //in the portal spawns 6 eggs, if not killed in time (approx. 20s)  they will hatch,  whelps can cast 60708
+    SPELL_POWER_OF_TENEBRON                     = 61248,    // Tenebron's presence increases Shadow damage taken by all enemies by 100%.
+    //Tenebron, dummy spell
+    SPELL_SUMMON_TWILIGHT_WHELP                 = 58035,    // doesn't work, will spawn NPC_TWILIGHT_WHELP
+    SPELL_SUMMON_SARTHARION_TWILIGHT_WHELP      = 58826,    // doesn't work, will spawn NPC_SHARTHARION_TWILIGHT_WHELP
+
+    SPELL_HATCH_EGGS_H                          = 59189,
+    SPELL_HATCH_EGGS                            = 58542,
+    SPELL_HATCH_EGGS_EFFECT_H                   = 59190,
+    SPELL_HATCH_EGGS_EFFECT                     = 58685,
+
+    //Whelps
+    NPC_TWILIGHT_WHELP                          = 30890,
+    NPC_SHARTHARION_TWILIGHT_WHELP              = 31214,
+    SPELL_FADE_ARMOR                            = 60708,    // Reduces the armor of an enemy by 1500 for 15s
+
+    //flame tsunami
+    SPELL_FLAME_TSUNAMI                         = 57494,    // the visual dummy
+    SPELL_FLAME_TSUNAMI_LEAP                    = 60241,    // SPELL_EFFECT_138 some leap effect, causing caster to move in direction
+    SPELL_FLAME_TSUNAMI_DMG_AURA                = 57492,    // periodic damage, npc has this aura
+
+    NPC_FLAME_TSUNAMI                           = 30616,    // for the flame waves
+    NPC_LAVA_BLAZE                              = 30643,    // adds spawning from flame strike
+
+    //using these custom points for dragons start and end
+    POINT_ID_INIT                               = 100,
+    POINT_ID_LAND                               = 200
+};
+
+//POS_SARTHARION_X                            = 3246.57,
+//POS_SARTHARION_Y                            = 551.263,
+
+struct Waypoint
+{
+    float m_fX, m_fY, m_fZ;
+};
 
-//Sartharion Spells
-#define SPELL_BERSERK                                 61632 // Increases the caster's attack speed by 150% and all damage it deals by 500% for 5 min.
-#define SPELL_CLEAVE                                  56909 // Inflicts 35% weapon damage to an enemy and its nearest allies, affecting up to 10 targets.
-#define SPELL_FLAME_BREATH_N                          56908 // Inflicts 8750 to 11250 Fire damage to enemies in a cone in front of the caster.
-#define SPELL_FLAME_BREATH_H                          58956 // Inflicts 10938 to 14062 Fire damage to enemies in a cone in front of the caster.
-#define SPELL_TAIL_LASH_N                             56910 // A sweeping tail strike hits all enemies behind the caster, inflicting 3063 to 3937 damage and stunning them for 2 sec.
-#define SPELL_TAIL_LASH_H                             58957 // A sweeping tail strike hits all enemies behind the caster, inflicting 4375 to 5625 damage and stunning them for 2 sec.
-#define SPELL_WILL_OF_SARTHARION                      61254 // Sartharion's presence bolsters the resolve of the Twilight Drakes, increasing their total health by 25%. This effect also increases Sartharion's health by 25%.
-#define SPELL_POWER_OF_SARTHARION                     61254 //Shadron's presence increases Fire damage taken by all enemies by 100%.
-
-//Sartharion Yell
-#define SAY_SARTHARION_AGGRO                         -1615016
-#define SAY_SARTHARION_BERSERK                       -1615017
-#define SAY_SARTHARION_BREATH                        -1615018
-#define SAY_SARTHARION_CALL_SHADRON                  -1615019
-#define SAY_SARTHARION_CALL_TENEBRON                 -1615020
-#define SAY_SARTHARION_CALL_VESPERON                 -1615021
-#define SAY_SARTHARION_DEATH                         -1615022
-#define SAY_SARTHARION_SPECIAL_1                     -1615023
-#define SAY_SARTHARION_SPECIAL_2                     -1615024
-#define SAY_SARTHARION_SPECIAL_3                     -1615025
-#define SAY_SARTHARION_SPECIAL_4                     -1615026
-#define SAY_SARTHARION_SLAY_1                        -1615027
-#define SAY_SARTHARION_SLAY_2                        -1615028
-#define SAY_SARTHARION_SLAY_3                        -1615029
-
-//Miniboses (Vesperon, Shadron, Tenebron)
-#define SPELL_SHADOW_BREATH_H                         59126 //Inflicts 8788 to 10212 Fire damage to enemies in a cone in front of the caster.
-#define SPELL_SHADOW_BREATH_N                         57570 //Inflicts 6938 to 8062 Fire damage to enemies in a cone in front of the caster.
-//TAIL LASH the same as Sartharion's
-#define SPELL_SHADOW_FISSURE_H                        59127 //Deals 9488 to 13512 Shadow damage to any enemy within the Shadow fissure after 5 sec.
-#define SPELL_SHADOW_FISSURE_N                        57579 //Deals 6188 to 8812 Shadow damage to any enemy within the Shadow fissure after 5 sec.
-
-//Vesperon
-#define MINIBOSS_VESPERON                             30449 //npc 30449  //In portal is a disciple, when disciple killed remove Power_of_vesperon, portal spawns multiple times
-#define BUFF_POWER_OF_VESPERON                        61251 //Vesperon's presence decreases the maximum health of all enemies by 25%.
-
-//Shadron
-#define MINIBOSS_SHADRON                              30451 //npc 30451  //In portal is a disciple, when disciple killed remove Power_of_vesperon, portal spawns multiple times
-#define BUFF_POWER_OF_SHADRON                         58105 //Shadron's presence increases Fire damage taken by all enemies by 100%.
-
-//Tenebron
-#define MINIBOSS_TENEBRON                             30452 //npc 30452 //in the portal spawns 6 eggs, if not killed in time (approx. 20s)  they will hatch,  whelps can cast 60708
-#define BUFF_POWER_OF_TENEBRON                        61248 //Tenebron's presence increases Shadow damage taken by all enemies by 100%.
-
-//Minibosses common spells
-#define SPELL_SHADOW_BREATH_N                         57570
-#define SPELL_SHADOW_BREATH_H                         59126
-#define SPELL_SHADOW_FISSURE_N                        57579
-#define SPELL_SHADOW_FISSURE_H                        59127
-#define SPELL_TWILIGHT_REVENGE                        60639
-
-//Tenebron, dummy spell
-#define SPELL_HATCH_EGGS                              58793
-
-//Whelps
-#define TWILIGHT_WHELP                                30890 //npc 30890
-#define SHARTHARION_TWILIGHT_WHELP                    31214 //npc 31214
-#define SPELL_FADE_ARMOR                              60708 //Reduces the armor of an enemy by 1500 for 15s
-
-/*Summons a portal, which all DPS and one healer should go through and proceed to kill all eggs. After about 20 seconds these eggs will hatch into whelplings with 60k health. Whelplings that hatched should be picked up by a tank and killed.
-Hatch Eggs Tenebron summons a portal in which eggs are spawned. After about 20s the eggs hatches into Whelps (156,396 hp - amount of whelps determined by Normal or Heroic mode) that do Fade Armor. */
+//each dragons special points. First where fly to before connect to connon, second where land point is.
+Waypoint m_aTene[]=
+{
+    {3212.854, 575.597, 109.856},                           //init
+    {3246.425, 565.367, 61.249}                             //end
+};
+
+Waypoint m_aShad[]=
+{
+    {3293.238, 472.223, 106.968},
+    {3271.669, 526.907, 61.931}
+};
+
+Waypoint m_aVesp[]=
+{
+    {3193.310, 472.861, 102.697},
+    {3227.268, 533.238, 59.995}
+};
+
+//points around raid "isle", counter clockwise. should probably be adjusted to be more alike
+Waypoint m_aDragonCommon[]=
+{
+    {3214.012, 468.932, 98.652},
+    {3244.950, 468.427, 98.652},
+    {3283.520, 496.869, 98.652},
+    {3287.316, 555.875, 98.652},
+    {3250.479, 585.827, 98.652},
+    {3209.969, 566.523, 98.652}
+};
+
+/*######
+## Boss Sartharion
+######*/
 
 struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI
 {
-    boss_sartharionAI(Creature *c) : ScriptedAI(c) {}
+    boss_sartharionAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+        m_bIsHeroic = pCreature->GetMap()->IsHeroic();
+    }
 
-    bool berserk;
+    ScriptedInstance* m_pInstance;
+    bool m_bIsHeroic;
 
-    void Reset()
+    bool m_bIsBerserk;
+    uint32 m_uiEnrageTimer;
+
+    uint32 m_uiTenebronTimer;
+    uint32 m_uiShadronTimer;
+    uint32 m_uiVesperonTimer;
+
+    uint32 m_uiFlameTsunamiTimer;
+    uint32 m_uiFlameBreathTimer;
+    uint32 m_uiTailSweepTimer;
+    uint32 m_uiCleaveTimer;
+    uint32 m_uiLavaStrikeTimer;
+
+    bool m_bHasCalledTenebron;
+    bool m_bHasCalledShadron;
+    bool m_bHasCalledVesperon;
+
+    void Reset() 
+    {
+        m_bIsBerserk = false;
+        m_uiEnrageTimer = MINUTE*15*IN_MILISECONDS;
+
+        m_uiTenebronTimer = 30000;
+        m_uiShadronTimer = 75000;
+        m_uiVesperonTimer = 120000;
+
+        m_uiFlameTsunamiTimer = 30000;
+        m_uiFlameBreathTimer = 20000;
+        m_uiTailSweepTimer = 20000;
+        m_uiCleaveTimer = 7000;
+        m_uiLavaStrikeTimer = 5000;
+
+        m_bHasCalledTenebron = false;
+        m_bHasCalledShadron = false;
+        m_bHasCalledVesperon = false;
+
+        if (m_pInstance)
+        {
+            if (!m_creature->isAlive())
+                return;
+
+            m_pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED);
+
+            //do dragons actually respawn like this? Commented for now, until confirmed.
+
+            /*if (Unit* Temp1 = Unit::GetUnit((*m_creature),m_pInstance->GetData64(DATA_TENEBRON)))
+                if (Temp1->isDead())
+                    ((Creature*)Temp1)->Respawn();
+
+            if (Unit* Temp2 = Unit::GetUnit((*m_creature),m_pInstance->GetData64(DATA_SHADRON)))
+                if (Temp2->isDead())
+                    ((Creature*)Temp2)->Respawn();
+
+            if (Unit* Temp3 = Unit::GetUnit((*m_creature),m_pInstance->GetData64(DATA_VESPERON)))
+                if (Temp3->isDead())
+                    ((Creature*)Temp3)->Respawn();*/
+        }
+
+        if (m_creature->HasAura(SPELL_TWILIGHT_REVENGE))
+            m_creature->RemoveAurasDueToSpell(SPELL_TWILIGHT_REVENGE);
+    }
+
+    void Aggro(Unit* pWho)
     {
-        berserk = false;
+        DoScriptText(SAY_SARTHARION_AGGRO,m_creature);
+        DoZoneInCombat();
+
+        if (m_pInstance)
+            m_pInstance->SetData(TYPE_SARTHARION_EVENT, IN_PROGRESS);
+
+        FetchDragons();
     }
-    void EnterCombat(Unit* who)
+
+    void JustDied(Unit* pKiller)
     {
         DoScriptText(SAY_SARTHARION_DEATH,m_creature);
+
+        if (m_pInstance)
+            m_pInstance->SetData(TYPE_SARTHARION_EVENT, DONE);
+    }
+
+    void KilledUnit(Unit* pVictim)
+    {
+        switch(rand()%3)
+        {
+            case 0: DoScriptText(SAY_SARTHARION_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SARTHARION_SLAY_2, m_creature); break;
+            case 2: DoScriptText(SAY_SARTHARION_SLAY_3, m_creature); break;
+        }
+    }
+
+    void FetchDragons()
+    {
+        Unit* pTene = Unit::GetUnit(*m_creature,m_pInstance->GetData64(DATA_TENEBRON));
+        Unit* pShad = Unit::GetUnit(*m_creature,m_pInstance->GetData64(DATA_SHADRON));
+        Unit* pVesp = Unit::GetUnit(*m_creature,m_pInstance->GetData64(DATA_VESPERON));
+
+        if (pTene && pTene->isAlive() && !pTene->getVictim())
+        {
+            pTene->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aTene[0].m_fX, m_aTene[0].m_fY, m_aTene[0].m_fZ);
+
+            if (!pTene->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                pTene->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
+
+        if (pShad && pShad->isAlive() && !pShad->getVictim())
+        {
+            pShad->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aShad[0].m_fX, m_aShad[0].m_fY, m_aShad[0].m_fZ);
+
+            if (!pShad->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                pShad->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
+
+        if (pVesp && pVesp->isAlive() && !pVesp->getVictim())
+        {
+            pVesp->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aVesp[0].m_fX, m_aVesp[0].m_fY, m_aVesp[0].m_fZ);
+
+            if (!pVesp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                pVesp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        }
+    }
+
+    void CallDragon(uint32 uiDataId)
+    {
+        if (m_pInstance)
+        {
+            Creature* pTemp = (Creature*)Unit::GetUnit((*m_creature),m_pInstance->GetData64(uiDataId));
+
+            if (pTemp && pTemp->isAlive() && !pTemp->getVictim())
+            {
+                if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
+                    pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+
+                if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                    pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+                int32 iTextId = 0;
+
+                switch(pTemp->GetEntry())
+                {
+                    case NPC_TENEBRON:
+                        iTextId = SAY_SARTHARION_CALL_TENEBRON;
+                        pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ);
+                        break;
+                    case NPC_SHADRON:
+                        iTextId = SAY_SARTHARION_CALL_SHADRON;
+                        pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ);
+                        break;
+                    case NPC_VESPERON:
+                        iTextId = SAY_SARTHARION_CALL_VESPERON;
+                        pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ);
+                        break;
+                }
+
+                DoScriptText(iTextId, m_creature);
+            }
+        }
+    }
+
+    void SendFlameTsunami()
+    {
+        Map* pMap = m_creature->GetMap();
+
+        if (pMap && pMap->IsDungeon())
+        {
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
+
+            if (!PlayerList.isEmpty())
+            {
+                for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                {
+                    if (i->getSource()->isAlive())
+                        DoScriptText(WHISPER_LAVA_CHURN,m_creature,i->getSource());
+                }
+            }
+        }
     }
-    void AttackStart(Unit* who) {}
-    void MoveInLineOfSight(Unit* who) {}
-    void UpdateAI(const uint32 diff)
+
+    void UpdateAI(const uint32 uiDiff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 10)
+        //reset if out of his platform, must find better/faster way to do this
+        //if (m_creature->GetDistance2d(POS_SARTHARION_X, POS_SARTHARION_Y) > 55)
+        //{
+            //EnterEvadeMode();
+            //return;
+        //}
+
+        if (!m_bIsBerserk && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 10)
         {
-            if(!berserk){
-                DoCast(m_creature,SPELL_BERSERK);
-                berserk = true;
-            }
+            DoScriptText(SAY_SARTHARION_BERSERK,m_creature);
+            DoCast(m_creature,SPELL_BERSERK);
+            m_bIsBerserk = true;
+        }
+
+        // enrage
+        if (m_uiEnrageTimer)
+        {
+            if (m_uiEnrageTimer < uiDiff)
+            {
+                DoCast(m_creature, SPELL_WILL_OF_SARTHARION);
+                m_uiEnrageTimer = 0;
+            }else m_uiEnrageTimer -= uiDiff;
         }
 
+        // flame tsunami
+        if (m_uiFlameTsunamiTimer < uiDiff)
+        {
+            SendFlameTsunami();
+            m_uiFlameTsunamiTimer = 30000;
+        }else m_uiFlameTsunamiTimer -= uiDiff;
+
+        // flame breath
+        if (m_uiFlameBreathTimer < uiDiff)
+        {
+            DoScriptText(SAY_SARTHARION_BREATH, m_creature);
+            DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_FLAME_BREATH_H : SPELL_FLAME_BREATH);
+            m_uiFlameBreathTimer = 25000 + rand()%10000;
+        }else m_uiFlameBreathTimer -= uiDiff;
+
+        // Tail Sweep
+        if (m_uiTailSweepTimer < uiDiff)
+        {
+            DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_TAIL_LASH_H : SPELL_TAIL_LASH);
+            m_uiTailSweepTimer = 15000 + rand()%5000;
+        }else m_uiTailSweepTimer -= uiDiff;
+
+        // Cleave
+        if (m_uiCleaveTimer < uiDiff)
+        {
+            DoCast(m_creature->getVictim(), SPELL_CLEAVE);
+            m_uiCleaveTimer = 7000 + rand()%3000;
+        }else m_uiCleaveTimer -= uiDiff;
+
+        // Lavas Strike
+        if (m_uiLavaStrikeTimer < uiDiff)
+        {
+            if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            {
+                DoCast(pTarget, SPELL_LAVA_STRIKE);
+
+                switch(rand()%15)
+                {
+                    case 0: DoScriptText(SAY_SARTHARION_SPECIAL_1, m_creature); break;
+                    case 1: DoScriptText(SAY_SARTHARION_SPECIAL_2, m_creature); break;
+                    case 2: DoScriptText(SAY_SARTHARION_SPECIAL_3, m_creature); break;
+                }
+            }
+            m_uiLavaStrikeTimer = 5000 + rand()%15000;
+        }else m_uiLavaStrikeTimer -= uiDiff;
+
+        // call tenebron
+        if (!m_bHasCalledTenebron && m_uiTenebronTimer < uiDiff)
+        {
+            CallDragon(DATA_TENEBRON);
+            m_bHasCalledTenebron = true;
+        }else m_uiTenebronTimer -= uiDiff;
+
+        // call shadron
+        if (!m_bHasCalledShadron && m_uiShadronTimer < uiDiff)
+        {
+            CallDragon(DATA_SHADRON);
+            m_bHasCalledShadron = true;
+        }else m_uiShadronTimer -= uiDiff;
+
+        // call vesperon
+        if (!m_bHasCalledVesperon && m_uiVesperonTimer < uiDiff)
+        {
+            CallDragon(DATA_VESPERON);
+            m_bHasCalledVesperon = true;
+        }else m_uiVesperonTimer -= uiDiff;
+
         DoMeleeAttackIfReady();
     }
-    void JustDied(Unit* killer)
+};
+
+CreatureAI* GetAI_boss_sartharion(Creature* pCreature)
+{
+    return new boss_sartharionAI(pCreature);
+}
+
+enum TeneText
+{
+    SAY_TENEBRON_AGGRO                      = -1615009,
+    SAY_TENEBRON_SLAY_1                     = -1615010,
+    SAY_TENEBRON_SLAY_2                     = -1615011,
+    SAY_TENEBRON_DEATH                      = -1615012,
+    SAY_TENEBRON_BREATH                     = -1615013,
+    SAY_TENEBRON_RESPOND                    = -1615014,
+    SAY_TENEBRON_SPECIAL_1                  = -1615015,
+    SAY_TENEBRON_SPECIAL_2                  = -1615016
+};
+
+enum ShadText
+{
+    SAY_SHADRON_AGGRO                       = -1615000,
+    SAY_SHADRON_SLAY_1                      = -1615001,
+    SAY_SHADRON_SLAY_2                      = -1615002,
+    SAY_SHADRON_DEATH                       = -1615003,
+    SAY_SHADRON_BREATH                      = -1615004,
+    SAY_SHADRON_RESPOND                     = -1615005,
+    SAY_SHADRON_SPECIAL_1                   = -1615006,
+    SAY_SHADRON_SPECIAL_2                   = -1615007
+};
+
+enum VespText
+{
+    SAY_VESPERON_AGGRO                      = -1615033,
+    SAY_VESPERON_SLAY_1                     = -1615034,
+    SAY_VESPERON_SLAY_2                     = -1615035,
+    SAY_VESPERON_DEATH                      = -1615036,
+    SAY_VESPERON_BREATH                     = -1615037,
+    SAY_VESPERON_RESPOND                    = -1615038,
+    SAY_VESPERON_SPECIAL_1                  = -1615039,
+    SAY_VESPERON_SPECIAL_2                  = -1615040
+};
+
+//to control each dragons common abilities
+struct TRINITY_DLL_DECL dummy_dragonAI : public ScriptedAI
+{
+    dummy_dragonAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
-        DoScriptText(SAY_SARTHARION_DEATH,m_creature);
+        m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+        m_bIsHeroic = pCreature->GetMap()->IsHeroic();
+    }
+
+    ScriptedInstance* m_pInstance;
+    bool m_bIsHeroic;
+
+    uint32 m_uiWaypointId;
+    uint32 m_uiMoveNextTimer;
+    int32 m_iPortalRespawnTime;
+    bool m_bCanMoveFree;
+
+    void Reset()
+    {
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+            m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+
+        m_uiWaypointId = 0;
+        m_uiMoveNextTimer = 500;
+        m_iPortalRespawnTime = 30000;
+        m_bCanMoveFree = false;
+    }
+
+    void MovementInform(uint32 uiType, uint32 uiPointId)
+    {
+        if (!m_pInstance || uiType != POINT_MOTION_TYPE)
+            return;
+
+        debug_log("dummy_dragonAI: %s reached point %u", m_creature->GetName(), uiPointId);
+
+        //if healers messed up the raid and we was already initialized
+        if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+        {
+            EnterEvadeMode();
+            return;
+        }
+
+        //this is end, if we reach this, don't do much
+        if (uiPointId == POINT_ID_LAND)
+        {
+            m_creature->GetMotionMaster()->Clear();
+            m_bCanMoveFree = false;
+            return;
+        }
+
+        //get amount of common points
+        uint32 uiCommonWPCount = sizeof(m_aDragonCommon)/sizeof(Waypoint);
+
+        //increase
+        m_uiWaypointId = uiPointId+1;
+
+        //if we have reached a point bigger or equal to count, it mean we must reset to point 0
+        if (m_uiWaypointId >= uiCommonWPCount)
+        {
+            if (!m_bCanMoveFree)
+                m_bCanMoveFree = true;
+
+            m_uiWaypointId = 0;
+        }
+
+        m_uiMoveNextTimer = 500;
+    }
+
+    //used when open portal and spawn mobs in phase
+    void DoRaidWhisper(int32 iTextId)
+    {
+        Map* pMap = m_creature->GetMap();
+
+        if (pMap && pMap->IsDungeon())
+        {
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
+
+            if (!PlayerList.isEmpty())
+            {
+                for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                    DoScriptText(iTextId, m_creature, i->getSource());
+            }
+        }
+    }
+
+    //"opens" the portal and does the "opening" whisper
+    void OpenPortal()
+    {
+        int32 iTextId = 0;
+
+        //there are 4 portal spawn locations, each are expected to be spawned with negative spawntimesecs in database
+
+        //using a grid search here seem to be more efficient than caching all four guids
+        //in instance script and calculate range to each.
+        GameObject* pPortal = m_creature->FindNearestGameObject(GO_TWILIGHT_PORTAL,50.0f);
+
+        switch(m_creature->GetEntry())
+        {
+            case NPC_TENEBRON:
+                iTextId = WHISPER_HATCH_EGGS;
+                break;
+            case NPC_SHADRON:
+            case NPC_VESPERON:
+                iTextId = WHISPER_OPEN_PORTAL;
+                break;
+        }
+
+        DoRaidWhisper(iTextId);
+
+        //By using SetRespawnTime() we will actually "spawn" the object with our defined time.
+        //Once time is up, portal will disappear again.
+        if (pPortal && !pPortal->isSpawned())
+            pPortal->SetRespawnTime(m_iPortalRespawnTime);
+
+        //Unclear what are expected to happen if one drake has a portal open already
+        //Refresh respawnTime so time again are set to 30secs?
+    }
+
+    //Removes each drakes unique debuff from players
+    void RemoveDebuff(uint32 uiSpellId)
+    {
+        Map* pMap = m_creature->GetMap();
+
+        if (pMap && pMap->IsDungeon())
+        {
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
+
+            if (PlayerList.isEmpty())
+                return;
+
+            for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            {
+                if (i->getSource()->isAlive() && i->getSource()->HasAura(uiSpellId))
+                    i->getSource()->RemoveAurasDueToSpell(uiSpellId);
+            }
+        }
+    }
+
+    void JustDied(Unit* pKiller)
+    {
+        int32 iTextId = 0;
+        uint32 uiSpellId = 0;
+
+        switch(m_creature->GetEntry())
+        {
+            case NPC_TENEBRON:
+                iTextId = SAY_TENEBRON_DEATH;
+                uiSpellId = SPELL_POWER_OF_TENEBRON;
+                break;
+            case NPC_SHADRON:
+                iTextId = SAY_SHADRON_DEATH;
+                uiSpellId = SPELL_POWER_OF_SHADRON;
+                break;
+            case NPC_VESPERON:
+                iTextId = SAY_VESPERON_DEATH;
+                uiSpellId = SPELL_POWER_OF_VESPERON;
+                break;
+        }
+
+        DoScriptText(iTextId, m_creature);
+
+        RemoveDebuff(uiSpellId);
+
+        if (m_pInstance)
+        {
+            // not if solo mini-boss fight
+            if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+                return;
+
+            // Twilight Revenge to main boss
+            if (Unit* pSartharion = Unit::GetUnit((*m_creature), m_pInstance->GetData64(DATA_SARTHARION)))
+            {
+                if (pSartharion->isAlive())
+                    m_creature->CastSpell(pSartharion,SPELL_TWILIGHT_REVENGE,true);
+            }
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        if (m_bCanMoveFree && m_uiMoveNextTimer)
+        {
+            if (m_uiMoveNextTimer < uiDiff)
+            {
+                m_creature->GetMotionMaster()->MovePoint(m_uiWaypointId,
+                    m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ);
+
+                debug_log("dummy_dragonAI: %s moving to point %u", m_creature->GetName(), m_uiWaypointId);
+                m_uiMoveNextTimer = 0;
+            } else m_uiMoveNextTimer -= uiDiff;
+        }
     }
 };
 
 /*######
-## Mob Vesperon
+## Mob Tenebron
 ######*/
 
-//Vesperon Yell
-#define SAY_VESPERON_AGGRO                       -1615030
-#define SAY_VESPERON_SLAY_1                      -1615031
-#define SAY_VESPERON_SLAY_2                      -1615032
-#define SAY_VESPERON_DEATH                       -1615033
-#define SAY_VESPERON_BREATH                      -1615034
-#define SAY_VESPERON_RESPOND                     -1615035
-#define SAY_VESPERON_SPECIAL_1                   -1615036
-#define SAY_VESPERON_SPECIAL_2                   -1615037
-
-struct TRINITY_DLL_DECL mob_vesperonAI : public ScriptedAI
+struct TRINITY_DLL_DECL mob_tenebronAI : public dummy_dragonAI
 {
-    mob_vesperonAI(Creature *c) : ScriptedAI(c) {}
+    mob_tenebronAI(Creature* pCreature) : dummy_dragonAI(pCreature) { }
+
+    uint32 m_uiShadowBreathTimer;
+    uint32 m_uiShadowFissureTimer;
+    uint32 m_uiHatchEggTimer;
 
-    void Reset() {}
-    void EnterCombat(Unit* who)
+    void Reset()
     {
-        DoScriptText(SAY_VESPERON_AGGRO,m_creature);
+        m_uiShadowBreathTimer = 20000;
+        m_uiShadowFissureTimer = 5000;
+        m_uiHatchEggTimer = 30000;
     }
-    void UpdateAI(const uint32 diff)
+
+    void Aggro(Unit* pWho) 
     {
-        //Return since we have no target
-        if(!UpdateVictim())
-            return;
+        DoScriptText(SAY_TENEBRON_AGGRO, m_creature);
+        DoZoneInCombat();
+        DoCast(m_creature, SPELL_POWER_OF_TENEBRON);
+    }
 
-        DoMeleeAttackIfReady();
+    void KilledUnit(Unit* pVictim)
+    {
+        switch(rand()%2)
+        {
+            case 0: DoScriptText(SAY_TENEBRON_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_TENEBRON_SLAY_2, m_creature); break;
+        }
     }
-    void JustDied(Unit* killer)
+
+    void UpdateAI(const uint32 uiDiff)
     {
-        DoScriptText(SAY_VESPERON_DEATH,m_creature);
+        //if no target, update dummy and return
+        if (!UpdateVictim())
+        {
+            dummy_dragonAI::UpdateAI(uiDiff);
+            return;
+        }
+
+        // shadow fissure
+        if (m_uiShadowFissureTimer < uiDiff)
+        {
+            if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                DoCast(pTarget, m_bIsHeroic ? SPELL_SHADOW_FISSURE_H : SPELL_SHADOW_FISSURE);
+
+            m_uiShadowFissureTimer = 15000 + rand()%5000;
+        }else m_uiShadowFissureTimer -= uiDiff;
+
+        // shadow breath
+        if (m_uiShadowBreathTimer < uiDiff)
+        {
+            DoScriptText(SAY_TENEBRON_BREATH, m_creature);
+            DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_SHADOW_BREATH_H : SPELL_SHADOW_BREATH);
+            m_uiShadowBreathTimer = 20000 + rand()%5000;
+        }else m_uiShadowBreathTimer -= uiDiff;
+
+        DoMeleeAttackIfReady();
     }
 };
 
+CreatureAI* GetAI_mob_tenebron(Creature* pCreature)
+{
+    return new mob_tenebronAI(pCreature);
+}
+
 /*######
 ## Mob Shadron
 ######*/
 
-//Shadron Yell
-#define SAY_SHADRON_AGGRO                       -1615000
-#define SAY_SHADRON_SLAY_1                      -1615001
-#define SAY_SHADRON_SLAY_2                      -1615002
-#define SAY_SHADRON_DEATH                       -1615003
-#define SAY_SHADRON_BREATH                      -1615004
-#define SAY_SHADRON_RESPOND                     -1615005
-#define SAY_SHADRON_SPECIAL_1                   -1615006
-#define SAY_SHADRON_SPECIAL_2                   -1615007
-
-struct TRINITY_DLL_DECL mob_shadronAI : public ScriptedAI
+struct TRINITY_DLL_DECL mob_shadronAI : public dummy_dragonAI
 {
-    mob_shadronAI(Creature *c) : ScriptedAI(c) {}
+    mob_shadronAI(Creature* pCreature) : dummy_dragonAI(pCreature) { }
+
+    uint32 m_uiShadowBreathTimer;
+    uint32 m_uiShadowFissureTimer;
+    uint32 m_uiAcolyteShadronTimer;
+
+    void Reset()
+    {
+        m_uiShadowBreathTimer = 20000;
+        m_uiShadowFissureTimer = 5000;
+        m_uiAcolyteShadronTimer = 60000;
+
+        if (m_creature->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
+            m_creature->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
+
+        if (m_creature->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
+            m_creature->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
+    }
 
-    void Reset(){}
-    void EnterCombat(Unit* who)
+    void Aggro(Unit* pWho) 
     {
         DoScriptText(SAY_SHADRON_AGGRO,m_creature);
+        DoZoneInCombat();
+        DoCast(m_creature, SPELL_POWER_OF_SHADRON);
     }
-    void UpdateAI(const uint32 diff)
+
+    void KilledUnit(Unit* pVictim)
     {
-        //Return since we have no target
-        if(!UpdateVictim())
+        switch(rand()%2)
+        {
+            case 0: DoScriptText(SAY_SHADRON_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_SHADRON_SLAY_2, m_creature); break;
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        //if no target, update dummy and return
+        if (!UpdateVictim())
+        {
+            dummy_dragonAI::UpdateAI(uiDiff);
             return;
+        }
+
+        // shadow fissure
+        if (m_uiShadowFissureTimer < uiDiff)
+        {
+            if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                DoCast(pTarget, m_bIsHeroic ? SPELL_SHADOW_FISSURE_H : SPELL_SHADOW_FISSURE);
+
+            m_uiShadowFissureTimer = 15000 + rand()%5000;
+        }else m_uiShadowFissureTimer -= uiDiff;
+
+        // shadow breath
+        if (m_uiShadowBreathTimer < uiDiff)
+        {
+            DoScriptText(SAY_SHADRON_BREATH, m_creature);
+            DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_SHADOW_BREATH_H : SPELL_SHADOW_BREATH);
+            m_uiShadowBreathTimer = 20000 + rand()%5000;
+        }else m_uiShadowBreathTimer -= uiDiff;
 
         DoMeleeAttackIfReady();
     }
-    void JustDied(Unit* killer)
-    {
-        DoScriptText(SAY_SHADRON_DEATH,m_creature);
-    }
 };
+
+CreatureAI* GetAI_mob_shadron(Creature* pCreature)
+{
+    return new mob_shadronAI(pCreature);
+}
+
 /*######
-## Mob Tenebron
+## Mob Vesperon
 ######*/
 
-//Yell
-#define SAY_TENEBRON_AGGRO                       -1615008
-#define SAY_TENEBRON_SLAY_1                      -1615009
-#define SAY_TENEBRON_SLAY_2                      -1615010
-#define SAY_TENEBRON_DEATH                       -1615011
-#define SAY_TENEBRON_BREATH                      -1615012
-#define SAY_TENEBRON_RESPOND                     -1615013
-#define SAY_TENEBRON_SPECIAL_1                   -1615014
-#define SAY_TENEBRON_SPECIAL_2                   -1615015
-
-struct TRINITY_DLL_DECL mob_tenebronAI : public ScriptedAI
+struct TRINITY_DLL_DECL mob_vesperonAI : public dummy_dragonAI
 {
-    mob_tenebronAI(Creature *c) : ScriptedAI(c) {}
+    mob_vesperonAI(Creature* pCreature) : dummy_dragonAI(pCreature) { }
 
-    void Reset() {}
-    void EnterCombat(Unit* who)
+    uint32 m_uiShadowBreathTimer;
+    uint32 m_uiShadowFissureTimer;
+    uint32 m_uiAcolyteVesperonTimer;
+
+    void Reset()
     {
-        DoScriptText(SAY_TENEBRON_AGGRO,m_creature);
+        m_uiShadowBreathTimer = 20000;
+        m_uiShadowFissureTimer = 5000;
+        m_uiAcolyteVesperonTimer = 60000;
     }
-    void UpdateAI(const uint32 diff)
+
+    void Aggro(Unit* pWho) 
     {
-        //Return since we have no target
-        if(!UpdateVictim())
+        DoScriptText(SAY_VESPERON_AGGRO,m_creature);
+        DoZoneInCombat();
+        DoCast(m_creature, SPELL_POWER_OF_VESPERON);
+    }
+
+    void KilledUnit(Unit* pVictim)
+    {
+        switch(rand()%2)
+        {
+            case 0: DoScriptText(SAY_VESPERON_SLAY_1, m_creature); break;
+            case 1: DoScriptText(SAY_VESPERON_SLAY_2, m_creature); break;
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        //if no target, update dummy and return
+        if (!UpdateVictim())
+        {
+            dummy_dragonAI::UpdateAI(uiDiff);
             return;
+        }
+
+        // shadow fissure
+        if (m_uiShadowFissureTimer < uiDiff)
+        {
+            if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                DoCast(pTarget, m_bIsHeroic ? SPELL_SHADOW_FISSURE_H : SPELL_SHADOW_FISSURE);
+
+            m_uiShadowFissureTimer = 15000 + rand()%5000;
+        }else m_uiShadowFissureTimer -= uiDiff;
+
+        // shadow breath
+        if (m_uiShadowBreathTimer < uiDiff)
+        {
+            DoScriptText(SAY_VESPERON_BREATH, m_creature);
+            DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_SHADOW_BREATH_H : SPELL_SHADOW_BREATH);
+            m_uiShadowBreathTimer = 20000 + rand()%5000;
+        }else m_uiShadowBreathTimer -= uiDiff;
 
         DoMeleeAttackIfReady();
     }
+};
+
+CreatureAI* GetAI_mob_vesperon(Creature* pCreature)
+{
+    return new mob_vesperonAI(pCreature);
+}
+
+/*######
+## Mob Acolyte of Shadron
+######*/
+
+struct TRINITY_DLL_DECL mob_acolyte_of_shadronAI : public ScriptedAI
+{
+    mob_acolyte_of_shadronAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+    }
+
+    ScriptedInstance* m_pInstance;
+
+    void Reset()
+    {
+        if (m_pInstance)
+        {
+            //if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
+            if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                DoCast(m_creature, SPELL_GIFT_OF_TWILIGTH_SAR);
+            else
+                DoCast(m_creature, SPELL_GIFT_OF_TWILIGTH_SHA);
+        }
+    }
+
     void JustDied(Unit* killer)
     {
-        DoScriptText(SAY_TENEBRON_DEATH,m_creature);
+        if (m_pInstance)
+        {
+            Creature* pDebuffTarget = NULL;
+
+            if (m_pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+            {
+                //not solo fight, so main boss has deduff
+                pDebuffTarget = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_SARTHARION));
+
+                if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR))
+                    pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR);
+            }
+            else
+            {
+                //event not in progress, then solo fight and must remove debuff mini-boss
+                pDebuffTarget = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_SHADRON));
+
+                if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
+                    pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
+            }
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        if (!UpdateVictim())
+            return;
+
+        DoMeleeAttackIfReady();
     }
 };
 
+CreatureAI* GetAI_mob_acolyte_of_shadron(Creature* pCreature)
+{
+    return new mob_acolyte_of_shadronAI(pCreature);
+}
+
 /*######
-## Mob Whelps
+## Mob Acolyte of Vesperon
 ######*/
-struct TRINITY_DLL_DECL mob_whelpAI : public ScriptedAI
+
+struct TRINITY_DLL_DECL mob_acolyte_of_vesperonAI : public ScriptedAI
 {
-    mob_whelpAI(Creature *c) : ScriptedAI(c) {}
+    mob_acolyte_of_vesperonAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
+    }
 
-    uint32 Fade_armor_Timer;
+    ScriptedInstance* m_pInstance;
 
-    void Reset() {}
-    void EnterCombat(Unit* who) {}
-    void UpdateAI(const uint32 diff)
+    void Reset()
     {
-        //Return since we have no target
-        if(!UpdateVictim())
+        DoCast(m_creature, SPELL_TWILIGHT_TORMENT_VESP_ACO);
+    }
+
+    void JustDied(Unit* pKiller)
+    {
+        // remove twilight torment on Vesperon
+        if (m_pInstance)
+        {
+            Creature* pVesperon = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_VESPERON));
+
+            if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
+                pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
+        }
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
     }
-    void JustDied(Unit* killer)  {}
 };
 
-CreatureAI* GetAI_mob_whelp(Creature *_Creature)
+CreatureAI* GetAI_mob_acolyte_of_vesperon(Creature* pCreature)
 {
-    return new mob_whelpAI (_Creature);
+    return new mob_acolyte_of_vesperonAI(pCreature);
 }
 
-CreatureAI* GetAI_mob_tenebron(Creature *_Creature)
+/*######
+## Mob Twilight Eggs
+######*/
+
+struct TRINITY_DLL_DECL mob_twilight_eggsAI : public ScriptedAI
 {
-    return new mob_tenebronAI (_Creature);
-}
+    mob_twilight_eggsAI(Creature* pCreature) : ScriptedAI(pCreature) { }
+
+    uint32 m_uiFadeArmorTimer;
+
+    void Reset()
+    {
+        m_uiFadeArmorTimer = 1000;
+    }
 
-CreatureAI* GetAI_mob_shadron(Creature *_Creature)
+    void AttackStart(Unit* pWho) { }
+    void MoveInLineOfSight(Unit* pWho) { }
+};
+
+CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature)
 {
-    return new mob_shadronAI (_Creature);
+    return new mob_twilight_eggsAI(pCreature);
 }
 
-CreatureAI* GetAI_mob_vesperon(Creature *_Creature)
+/*######
+## Mob Twilight Whelps
+######*/
+
+struct TRINITY_DLL_DECL mob_twilight_whelpAI : public ScriptedAI
 {
-    return new mob_vesperonAI (_Creature);
-}
+    mob_twilight_whelpAI(Creature* pCreature) : ScriptedAI(pCreature) { }
 
-CreatureAI* GetAI_boss_sartharion(Creature *_Creature)
+    uint32 m_uiFadeArmorTimer;
+
+    void Reset()
+    {
+        m_uiFadeArmorTimer = 1000;
+    }
+
+    void UpdateAI(const uint32 uiDiff)
+    {
+        //Return since we have no target
+        if (!UpdateVictim())
+            return;
+
+        // twilight torment
+        if (m_uiFadeArmorTimer < uiDiff)
+        {
+            DoCast(m_creature->getVictim(), SPELL_FADE_ARMOR);
+            m_uiFadeArmorTimer = 5000 + rand()%5000;
+        }else m_uiFadeArmorTimer -= uiDiff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+CreatureAI* GetAI_mob_twilight_whelp(Creature* pCreature)
 {
-    return new boss_sartharionAI (_Creature);
+    return new mob_twilight_whelpAI(pCreature);
 }
 
 void AddSC_boss_sartharion()
@@ -294,7 +1095,22 @@ void AddSC_boss_sartharion()
     newscript->RegisterSelf();
 
     newscript = new Script;
-    newscript->Name="mob_whelp";
-    newscript->GetAI = &GetAI_mob_whelp;
+    newscript->Name="mob_acolyte_of_shadron";
+    newscript->GetAI = &GetAI_mob_acolyte_of_shadron;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="mob_acolyte_of_vesperon";
+    newscript->GetAI = &GetAI_mob_acolyte_of_vesperon;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="mob_twilight_eggs";
+    newscript->GetAI = &GetAI_mob_twilight_eggs;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="mob_twilight_whelp";
+    newscript->GetAI = &GetAI_mob_twilight_whelp;
     newscript->RegisterSelf();
 }
diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
index 96885e7e672..ceea0a66d85 100644
--- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
+++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
@@ -97,9 +97,6 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
         FireballTimer = 18000;
 
         InitialSpawn = true;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit* who)
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
index 953fbcb198c..377c19ec491 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
@@ -218,8 +218,6 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
         }
         ClearBudyList();
         gatherOthersWhenAggro = true;
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
-        m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
     }
 
     void GainSentinelAbility(uint32 id)
@@ -234,12 +232,6 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
         }
         SentinelAbilityAura *a = new SentinelAbilityAura(this, (SpellEntry*)spell, id, eff_mask);
         m_creature->AddAura(a);
-
-        if (id == SPELL_KNOCK_BUFF)
-        {
-            m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-            m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
-        }
     }
 
     void EnterCombat(Unit *who)
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
index b3b92cbc2c7..895e91c13c6 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
@@ -71,9 +71,6 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
 
         Spawned = false;
         PhaseTwo = false;
-
-        m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-        m_creature->ApplySpellImmune(1, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
 
     void EnterCombat(Unit *who)
diff --git a/src/shared/Errors.h b/src/shared/Errors.h
index 5cfd109ee01..992b1752a0f 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Errors.h
@@ -23,10 +23,6 @@
 
 #include "Common.h"
 
-#ifndef HAVE_CONFIG_H
-#define HAVE_ACE_STACK_TRACE_H 1
-#endif
-
 #ifdef HAVE_ACE_STACK_TRACE_H
 #include "ace/Stack_Trace.h"
 #endif